speatzle/go-passbolt
1
0
Fork 0
mirror of https://github.com/passbolt/go-passbolt.git synced 2025-09-13 06:19:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #59 from passbolt/v5-schema-fixes
Some checks failed
Go / test (push) Has been cancelled
Details

Browse source 
V5 schema fixes
This commit is contained in:
Samuel Lorch 2025-08-11 15:53:14 +02:00 • committed by GitHub
commit 1ffa5a23bd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 41 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

72
api/schema.go
View file

@ -15,22 +15,19 @@ var ResourceSchemas = map[string]json.RawMessage{
"maxLength": 255
},
"username": {
"type": "string",
"maxLength": 255,
"nullable": true
"type": ["string", "null"],
"maxLength": 255
},
"uris": {
"type": "array",
"items": {
"type": "string",
"maxLength": 1024,
"nullable": true
"maxLength": 1024
}
},
"description": {
"type": "string",
"maxLength": 10000,
"nullable": true
"type": ["string", "null"],
"maxLength": 10000
}
}
},
@ -43,14 +40,12 @@ var ResourceSchemas = map[string]json.RawMessage{
"enum": ["PASSBOLT_SECRET_DATA"]
},
"password": {
"type": "string",
"maxLength": 4096,
"nullable": true
"type": ["string", "null"],
"maxLength": 4096
},
"description": {
"type": "string",
"maxLength": 10000,
"nullable": true
"type": ["string", "null"],
"maxLength": 10000
}
}
}
@ -66,22 +61,19 @@ var ResourceSchemas = map[string]json.RawMessage{
"maxLength": 255
},
"username": {
"type": "string",
"maxLength": 255,
"nullable": true
"type": ["string", "null"],
"maxLength": 255
},
"uris": {
"type": "array",
"items": {
"type": "string",
"maxLength": 1024,
"nullable": true
"maxLength": 1024
}
},
"description": {
"type": "string",
"maxLength": 10000,
"nullable": true
"type": ["string", "null"],
"maxLength": 10000
}
}
},
@ -101,22 +93,19 @@ var ResourceSchemas = map[string]json.RawMessage{
"maxLength": 255
},
"username": {
"type": "string",
"maxLength": 255,
"nullable": true
"type": ["string", "null"],
"maxLength": 255
},
"uris": {
"type": "array",
"items": {
"type": "string",
"maxLength": 1024,
"nullable": true
"maxLength": 1024
}
},
"description": {
"type": "string",
"maxLength": 10000,
"nullable": true
"type": ["string", "null"],
"maxLength": 10000
}
}
},
@ -129,14 +118,12 @@ var ResourceSchemas = map[string]json.RawMessage{
"enum": ["PASSBOLT_SECRET_DATA"]
},
"password": {
"type": "string",
"maxLength": 4096,
"nullable": true
"type": ["string", "null"],
"maxLength": 4096
},
"description": {
"type": "string",
"maxLength": 10000,
"nullable": true
"type": ["string", "null"],
"maxLength": 10000
},
"totp": {
"type": "object",
@ -174,23 +161,16 @@ var ResourceSchemas = map[string]json.RawMessage{
"type": "string",
"maxLength": 255
},
"username": {
"type": "string",
"maxLength": 255,
"nullable": true
},
"uris": {
"type": "array",
"items": {
"type": "string",
"maxLength": 1024,
"nullable": true
"maxLength": 1024
}
},
"description": {
"type": "string",
"maxLength": 10000,
"nullable": true
"type": ["string", "null"],
"maxLength": 10000
}
}
},

16
helper/resource_get.go
View file

@ -173,7 +173,21 @@ func GetResourceFromData(c *api.Client, resource api.Resource, secret api.Secret
pw = rawSecretData
case "v5-totp-standalone":
// nothing fits into the interface in this case
rawMetadata, err := GetResourceMetadata(ctx, c, &resource, &rType)
if err != nil {
return "", "", "", "", "", "", fmt.Errorf("Getting Metadata: %w", err)
}
var metadata api.ResourceMetadataTypeV5TOTPStandalone
err = json.Unmarshal([]byte(rawMetadata), &metadata)
if err != nil {
return "", "", "", "", "", "", fmt.Errorf("Parsing Decrypted Metadata: %w", err)
}
name = metadata.Name
if len(metadata.URIs) != 0 {
uri = metadata.URIs[0]
}
default:
return "", "", "", "", "", "", fmt.Errorf("Unknown ResourceType: %v", rType.Slug)
}