Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Catch publish up with main #666

Merged
merged 14 commits into from
Jan 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions data/schema/v1/Decision_Point-1-0-1.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"title": "Decision Point schema definition",
"$id": "https://certcc.github.io/SSVC/data/schema/v1/Decision_Point-1-0-1.schema.json",
"description": "Decision points are the basic building blocks of SSVC decision functions. Individual decision points describe a single aspect of the input to a decision function.",
"definitions": {
"$defs": {
"schemaVersion": {
"description": "Schema version used to represent this Decision Point",
"type": "string",
Expand Down Expand Up @@ -37,7 +37,7 @@
"additionalProperties": false,
"properties": {
"schemaVersion": {
"$ref": "#/definitions/schemaVersion"
"$ref": "#/$defs/schemaVersion"
},
"namespace": {
"type": "string",
Expand Down Expand Up @@ -65,7 +65,7 @@
"type": "array",
"minItems": 1,
"items": {
"$ref": "#/definitions/decision_point_value"
"$ref": "#/$defs/decision_point_value"
}
}
},
Expand All @@ -80,5 +80,5 @@
]
}
},
"$ref": "#/definitions/decision_point"
"$ref": "#/$defs/decision_point"
}
6 changes: 3 additions & 3 deletions data/schema/v1/Decision_Point_Group-1-0-1.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "https://json-schema.org/draft/2020-12/schema",
"title": "Decision Points Group schema definition",
"$id": "https://certcc.github.io/SSVC/data/schema/v1/Decision_Point_Group-1-0-1.schema.json",
"definitions": {
"$defs": {
"schemaVersion": {
"description": "Schema version used to represent Decision Point Group",
"type": "string",
Expand All @@ -13,7 +13,7 @@
"additionalProperties": false,
"properties": {
"schemaVersion": {
"$ref": "#/definitions/schemaVersion"
"$ref": "#/$defs/schemaVersion"
},
"version": {
"type": "string",
Expand Down Expand Up @@ -44,6 +44,6 @@
]
}
},
"$ref": "#/definitions/decision_point_group"
"$ref": "#/$defs/decision_point_group"

}
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://certcc.github.io/SSVC/data/schema/v1/Decision_Point_Value_Selection-1-0-1.schema.json",
"definitions": {
"$defs": {
"id": {
"type": "string",
"description": "Identifier for a vulnerability could be CVE, CERT/CC VU#, OSV id, Bugtraq, GHSA etc.",
"examples": ["CVE-2024-101010","VU#11111","GHSA-11a1-22b2-33c3"]
"examples": ["CVE-1900-1234","VU#11111","GHSA-11a1-22b2-33c3"]
},
"role": {
"type": "string",
Expand Down Expand Up @@ -35,7 +35,7 @@
"description": "SSVC Namespace that were used for defining the evaluated Decision Points",
"title": "namespace",
"type": "string",
"examples": ["ssvc","cvvsv4"]
"examples": ["ssvc","cvssv4"]
},
"values": {
"description": "Evaluated values of the Decision Point",
Expand Down Expand Up @@ -66,24 +66,24 @@
},
"properties": {
"id": {
"$ref": "#/definitions/id"
"$ref": "#/$defs/id"
},
"role": {
"$ref": "#/definitions/role"
"$ref": "#/$defs/role"
},
"schemaVersion": {
"$ref": "#/definitions/schemaVersion"
"$ref": "#/$defs/schemaVersion"
},
"timestamp": {
"$ref": "#/definitions/timestamp"
"$ref": "#/$defs/timestamp"
},
"selections": {
"description" : "An array of Decision Points and their Values that were down-selected or evaluated ",
"title": "selections",
"type": "array",
"minItems": 1,
"items": {
"$ref": "#/definitions/SsvcdecisionpointselectionSchema"
"$ref": "#/$defs/SsvcdecisionpointselectionSchema"
}
}
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"id": "CVE-1969-0000",
"id": "CVE-1900-1234",
"timestamp": "2021-09-29T15:29:44Z",
"schemaVersion": "1-0-1",
"selections": [
Expand Down
10 changes: 5 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
mkdocs==1.6.1
mkdocs-bibtex==2.16.2
mkdocs-include-markdown-plugin==7.0.0
mkdocs-include-markdown-plugin==7.1.2
mkdocs-table-reader-plugin==3.1.0
mkdocs-material==9.5.42
mkdocs-material==9.5.49
mkdocs-material-extensions==1.3.1
mkdocstrings==0.26.2
mkdocstrings-python==1.12.2
mkdocstrings==0.27.0
mkdocstrings-python==1.13.0
mkdocs-print-site-plugin==2.6.0
dataclasses-json==0.6.7
thefuzz==0.22.1
pandas==2.2.3
scikit-learn==1.5.2
scikit-learn==1.6.1
jsonschema==4.23.0
networkx==3.4.2
Loading