add OU
parent
1f7cec3abd
commit
129cf11f48
|
|
@ -47,7 +47,7 @@ jobs:
|
||||||
context: . # UTILISE LE CONTEXTE LOCAL, PAS L'URL GIT
|
context: . # UTILISE LE CONTEXTE LOCAL, PAS L'URL GIT
|
||||||
push: ${{ github.event_name != 'pull_request' }}
|
push: ${{ github.event_name != 'pull_request' }}
|
||||||
tags: |
|
tags: |
|
||||||
harbor.bv.stef.lan/library/pki-manager:${{env.GITHUB_SHA}}
|
harbor.bv.stef.lan/library/pki-manager:latest
|
||||||
cache-from: type=gha
|
cache-from: type=gha
|
||||||
cache-to: type=gha,mode=max
|
cache-to: type=gha,mode=max
|
||||||
provenance: false # Peut simplifier le débogage initialement
|
provenance: false # Peut simplifier le débogage initialement
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@ type CA struct {
|
||||||
Name string `json:"name" bson:"name"`
|
Name string `json:"name" bson:"name"`
|
||||||
CommonName string `json:"common_name" bson:"common_name"`
|
CommonName string `json:"common_name" bson:"common_name"`
|
||||||
Organization string `json:"organization" bson:"organization"`
|
Organization string `json:"organization" bson:"organization"`
|
||||||
|
OrganizationalUnit string `json:"organization_unit" bson:"organization_unit"`
|
||||||
Country string `json:"country" bson:"country"`
|
Country string `json:"country" bson:"country"`
|
||||||
Province string `json:"province" bson:"province"`
|
Province string `json:"province" bson:"province"`
|
||||||
Locality string `json:"locality" bson:"locality"`
|
Locality string `json:"locality" bson:"locality"`
|
||||||
|
|
@ -27,6 +28,7 @@ type CreateCARequest struct {
|
||||||
Name string `json:"name" binding:"required"`
|
Name string `json:"name" binding:"required"`
|
||||||
CommonName string `json:"common_name" binding:"required"`
|
CommonName string `json:"common_name" binding:"required"`
|
||||||
Organization string `json:"organization" binding:"required"`
|
Organization string `json:"organization" binding:"required"`
|
||||||
|
OrganizationalUnit string `json:"organization_unit" binding:"required"`
|
||||||
Country string `json:"country" binding:"required"`
|
Country string `json:"country" binding:"required"`
|
||||||
Province string `json:"province"`
|
Province string `json:"province"`
|
||||||
Locality string `json:"locality"`
|
Locality string `json:"locality"`
|
||||||
|
|
@ -39,5 +41,6 @@ type CreateCARequest struct {
|
||||||
type UpdateCARequest struct {
|
type UpdateCARequest struct {
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
Organization string `json:"organization"`
|
Organization string `json:"organization"`
|
||||||
|
OrganizationalUnit string `json:"organization_unit"`
|
||||||
Email string `json:"email"`
|
Email string `json:"email"`
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@ type SubCA struct {
|
||||||
Name string `json:"name" bson:"name"`
|
Name string `json:"name" bson:"name"`
|
||||||
CommonName string `json:"common_name" bson:"common_name"`
|
CommonName string `json:"common_name" bson:"common_name"`
|
||||||
Organization string `json:"organization" bson:"organization"`
|
Organization string `json:"organization" bson:"organization"`
|
||||||
|
OrganizationalUnit string `json:"organization_unit" bson:"organization_unit"`
|
||||||
Country string `json:"country" bson:"country"`
|
Country string `json:"country" bson:"country"`
|
||||||
Province string `json:"province" bson:"province"`
|
Province string `json:"province" bson:"province"`
|
||||||
Locality string `json:"locality" bson:"locality"`
|
Locality string `json:"locality" bson:"locality"`
|
||||||
|
|
@ -27,6 +28,7 @@ type CreateSubCARequest struct {
|
||||||
Name string `json:"name" binding:"required"`
|
Name string `json:"name" binding:"required"`
|
||||||
CommonName string `json:"common_name" binding:"required"`
|
CommonName string `json:"common_name" binding:"required"`
|
||||||
Organization string `json:"organization" binding:"required"`
|
Organization string `json:"organization" binding:"required"`
|
||||||
|
OrganizationalUnit string `json:"organization_unit" binding:"required"`
|
||||||
Country string `json:"country" binding:"required"`
|
Country string `json:"country" binding:"required"`
|
||||||
Province string `json:"province"`
|
Province string `json:"province"`
|
||||||
Locality string `json:"locality"`
|
Locality string `json:"locality"`
|
||||||
|
|
@ -39,5 +41,6 @@ type CreateSubCARequest struct {
|
||||||
type UpdateSubCARequest struct {
|
type UpdateSubCARequest struct {
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
Organization string `json:"organization"`
|
Organization string `json:"organization"`
|
||||||
|
OrganizationalUnit string `json:"organization_unit"`
|
||||||
Email string `json:"email"`
|
Email string `json:"email"`
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -38,6 +38,7 @@ func (s *CryptoService) GenerateRootCA(req models.CreateCARequest) (*models.CA,
|
||||||
subject := pkix.Name{
|
subject := pkix.Name{
|
||||||
CommonName: req.CommonName,
|
CommonName: req.CommonName,
|
||||||
Organization: []string{req.Organization},
|
Organization: []string{req.Organization},
|
||||||
|
OrganizationalUnit []string{req.OrganizationalUnit},
|
||||||
Country: []string{req.Country},
|
Country: []string{req.Country},
|
||||||
Province: []string{req.Province},
|
Province: []string{req.Province},
|
||||||
Locality: []string{req.Locality},
|
Locality: []string{req.Locality},
|
||||||
|
|
@ -88,6 +89,7 @@ func (s *CryptoService) GenerateRootCA(req models.CreateCARequest) (*models.CA,
|
||||||
Name: req.Name,
|
Name: req.Name,
|
||||||
CommonName: req.CommonName,
|
CommonName: req.CommonName,
|
||||||
Organization: req.Organization,
|
Organization: req.Organization,
|
||||||
|
OrganizationalUnit: req.OrganizationalUnit,
|
||||||
Country: req.Country,
|
Country: req.Country,
|
||||||
Province: req.Province,
|
Province: req.Province,
|
||||||
Locality: req.Locality,
|
Locality: req.Locality,
|
||||||
|
|
@ -137,6 +139,7 @@ func (s *CryptoService) GenerateSubCA(req models.CreateSubCARequest, parentCA *m
|
||||||
subject := pkix.Name{
|
subject := pkix.Name{
|
||||||
CommonName: req.CommonName,
|
CommonName: req.CommonName,
|
||||||
Organization: []string{req.Organization},
|
Organization: []string{req.Organization},
|
||||||
|
OrganizationalUnit []string{req.OrganizationalUnit},
|
||||||
Country: []string{req.Country},
|
Country: []string{req.Country},
|
||||||
Province: []string{req.Province},
|
Province: []string{req.Province},
|
||||||
Locality: []string{req.Locality},
|
Locality: []string{req.Locality},
|
||||||
|
|
@ -177,6 +180,7 @@ func (s *CryptoService) GenerateSubCA(req models.CreateSubCARequest, parentCA *m
|
||||||
Name: req.Name,
|
Name: req.Name,
|
||||||
CommonName: req.CommonName,
|
CommonName: req.CommonName,
|
||||||
Organization: req.Organization,
|
Organization: req.Organization,
|
||||||
|
OrganizationalUnit: req.OrganizationalUnit,
|
||||||
Country: req.Country,
|
Country: req.Country,
|
||||||
Province: req.Province,
|
Province: req.Province,
|
||||||
Locality: req.Locality,
|
Locality: req.Locality,
|
||||||
|
|
|
||||||
|
|
@ -120,6 +120,10 @@
|
||||||
<label for="caOrganization">Organization</label>
|
<label for="caOrganization">Organization</label>
|
||||||
<input type="text" id="caOrganization" name="organization" required>
|
<input type="text" id="caOrganization" name="organization" required>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="caOrganization_unit">Organizational Unit</label>
|
||||||
|
<input type="text" id="caOrganization_unit" name="organization_unit" required>
|
||||||
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="caCountry">Country (2 letters)</label>
|
<label for="caCountry">Country (2 letters)</label>
|
||||||
<input type="text" id="caCountry" name="country" maxlength="2" required>
|
<input type="text" id="caCountry" name="country" maxlength="2" required>
|
||||||
|
|
@ -178,6 +182,10 @@
|
||||||
<label for="subcaOrganization">Organization</label>
|
<label for="subcaOrganization">Organization</label>
|
||||||
<input type="text" id="subcaOrganization" name="organization" required>
|
<input type="text" id="subcaOrganization" name="organization" required>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="subcaOrganization_unit">Organizational Unit</label>
|
||||||
|
<input type="text" id="subcaOrganization_unit" name="organization_unit" required>
|
||||||
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="subcaEmail">Email (optional)</label>
|
<label for="subcaEmail">Email (optional)</label>
|
||||||
<input type="email" id="subcaEmail" name="email" placeholder="Optional email address">
|
<input type="email" id="subcaEmail" name="email" placeholder="Optional email address">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue