1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2024-09-20 07:35:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: 创建CA机构生成的应为证书而非证书签名请求 (#6404)
Some checks failed
Build Test / build-linux-binary (push) Failing after -8m28s
Details
Build / SonarCloud (push) Failing after -8m45s
Details
sync2gitee / repo-sync (push) Failing after -8m48s
Details

Browse source
This commit is contained in:
Anye 2024-09-07 21:56:38 +08:00 committed by GitHub
parent a53fff2416
commit 466617847f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
backend/app/service/website_ca.go
View file

@ -432,14 +432,14 @@ func (w WebsiteCAService) DownloadFile(id uint) (*os.File, error) {
if err = fileOp.CreateDir(dir, 0666); err != nil {
return nil, err
}
if err = fileOp.WriteFile(path.Join(dir, "ca.csr"), strings.NewReader(ca.CSR), 0644); err != nil {
if err = fileOp.WriteFile(path.Join(dir, "ca.crt"), strings.NewReader(ca.CSR), 0644); err != nil {
return nil, err
}
if err = fileOp.WriteFile(path.Join(dir, "private.key"), strings.NewReader(ca.PrivateKey), 0644); err != nil {
if err = fileOp.WriteFile(path.Join(dir, "ca.key"), strings.NewReader(ca.PrivateKey), 0644); err != nil {
return nil, err
}
fileName := ca.Name + ".zip"
if err = fileOp.Compress([]string{path.Join(dir, "ca.csr"), path.Join(dir, "private.key")}, dir, fileName, files.SdkZip, ""); err != nil {
if err = fileOp.Compress([]string{path.Join(dir, "ca.crt"), path.Join(dir, "ca.key")}, dir, fileName, files.SdkZip, ""); err != nil {
return nil, err
}
return os.Open(path.Join(dir, fileName))

2
frontend/src/views/website/ssl/ca/detail/index.vue
View file

@ -6,7 +6,7 @@
<div v-loading="loading">
<el-radio-group v-model="curr">
<el-radio-button value="detail">{{ $t('ssl.organizationDetail') }}</el-radio-button>
<el-radio-button value="ssl">csr</el-radio-button>
<el-radio-button value="ssl">{{ $t('ssl.ssl') }}</el-radio-button>
<el-radio-button value="key">{{ $t('ssl.key') }}</el-radio-button>
</el-radio-group>
<div v-if="curr === 'detail'" class="mt-5">