Skip to content

Commit

Permalink
Merge pull request #257 from iriusrisk/release/1.15.0
Browse files Browse the repository at this point in the history 
release/1.15.0 to main
  • Loading branch information
@dfernandezvigo
dfernandezvigo authored Jun 15, 2023
2 parents 151ca2a + b1a9a8a commit 7d6a755
Show file tree
Hide file tree
Showing 51 changed files with 1,327 additions and 348 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/sonarcloud.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ name: SonarCloud analysis

on:
pull_request:
branches: [feature/*]
branches: [dev,feature/*]
push:
branches: [dev]
workflow_dispatch:

permissions:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/startleft-unit-integration-full.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
if: runner.os == 'Windows'
shell: bash
run: |
pip install --global-option=build_ext --global-option="-IC:\Program files\Graphviz\include" --global-option="-LC:\Program files\Graphviz\lib" pygraphviz
pip install --global-option=build_ext --global-option="-IC:\Program files\Graphviz\include" --global-option="-LC:\Program files\Graphviz\lib" pygraphviz==1.10
echo "C:\Program Files\Graphviz\bin" >> $GITHUB_PATH
- name: Install dependencies
Expand Down
10 changes: 6 additions & 4 deletions deployment/Dockerfile.docs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
FROM squidfunk/mkdocs-material

RUN pip install --upgrade pip

RUN pip install -r requirements.txt
RUN adduser -D startleft
USER startleft

COPY /docs ./docs
COPY mkdocs.yml .
COPY mkdocs.yml .

RUN pip install --upgrade pip
RUN pip install -r docs/requirements.txt
5 changes: 2 additions & 3 deletions docs/requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
mkdocs-material==9.1.1
pymdown-extensions==9.10
mkdocs-glightbox==0.3.1
mkdocs-material==9.1.14
mkdocs-glightbox==0.3.4
125 changes: 64 additions & 61 deletions otm/resources/schemas/otm_schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,55 +12,55 @@
"properties": {
"name": {"type": "string"},
"id": {"type": "string"},
"description": {"type": "string"},
"owner": {"type": "string"},
"ownerContact": {"type": "string"},
"description": {"type": ["string", "null"]},
"owner": {"type": ["string", "null"]},
"ownerContact": {"type": ["string", "null"]},
"tags": {
"type": "array",
"type": ["array", "null"],
"items": {
"type": "string"
}
},
"attributes": {"type": "object"}
"attributes": {"type": ["object", "null"]}
}
},
"representations": {
"type": "array",
"type": ["array", "null"],
"required": ["name", "id", "type"],
"properties": {
"name": {"type": "string"},
"id": {"type": "string"},
"type": {"type": "string"},
"description": {"type": "string"},
"description": {"type": ["string", "null"]},
"size": {"$ref": "#/definitions/size"},
"repository": {
"type": "object",
"type": ["object", "null"],
"required": ["url"],
"properties": {
"url": {"type": "string"}
"url": {"type": ["string", "null"]}
}
},
"attributes": {"type": "object"}
"attributes": {"type": ["object", "null"]}
}
},
"assets": {
"type": "array",
"type": ["array", "null"],
"required": ["name", "id", "risk"],
"properties": {
"name": {"type": "string"},
"id": {"type": "string"},
"description": {"type": "string"},
"description": {"type": ["string", "null"]},
"risk": {
"type": "object",
"required": ["confidentiality", "integrity", "availability"],
"properties": {
"confidentiality": {"type": "number"},
"integrity": {"type": "number"},
"availability": {"type": "number"},
"comment": {"type": "string"}
"comment": {"type": ["string", "null"]}
}
},
"attributes": {"type": "object"}
"attributes": {"type": ["object", "null"]}
}
},
"trustZones": {
Expand All @@ -72,7 +72,7 @@
"id": {"type": "string"},
"name": {"type": "string"},
"type": {"type": "string"},
"description": {"type": "string"},
"description": {"type": ["string", "null"]},
"risk": {
"type": "object",
"required": ["trustRating"],
Expand All @@ -82,56 +82,56 @@
},
"parent": {"$ref": "#/definitions/parent"},
"representations": {
"type": "array",
"type": ["array", "null"],
"items": {"$ref": "#/definitions/representationElement"}
},
"attributes": {"type": "object"}
"attributes": {"type": ["object", "null"]}
}
}
},
"components": {
"type": "array",
"type": ["array", "null"],
"items": {
"type": "object",
"required": ["id", "name", "type", "parent"],
"properties": {
"id": {"type": "string"},
"name": {"type": "string"},
"type": {"type": "string"},
"description": {"type": "string"},
"description": {"type": ["string", "null"]},
"parent": {"$ref": "#/definitions/parent"},
"representations": {
"type": "array",
"type": ["array", "null"],
"items": {"$ref": "#/definitions/representationElement"}
},
"assets": {
"type": "object",
"type": ["object", "null"],
"properties": {
"stored": {
"type": "array",
"type": ["array", "null"],
"items": {
"type": "string"
"type": ["string", "null"]
}
},
"processed": {
"type": "array",
"type": ["array", "null"],
"items": {
"type": "string"
"type": ["string", "null"]
}
}
}
},
"threats": {
"type": "array",
"type": ["array", "null"],
"items": {"$ref": "#/definitions/threat/"}
},
"tags": {
"type": "array",
"type": ["array", "null"],
"items": {
"type": "string"
"type": ["string", "null"]
}
},
"attributes": {"type": "object"}
"attributes": {"type": ["object", "null"]}
}
}
},
Expand All @@ -143,80 +143,83 @@
"properties": {
"id": {"type": "string"},
"name": {"type": "string"},
"description": {"type": "string"},
"bidirectional": {"type": "boolean"},
"description": {"type": ["string", "null"]},
"bidirectional": {"type": ["boolean", "null"]},
"source": {"type": "string"},
"destination": {"type": "string"},
"assets": {
"type": "array",
"items": {"type": "string"}
"type": ["array", "null"],
"items": {"type": ["string", "null"]}
},
"threats": {
"type": ["array", "null"],
"items": {"$ref": "#/definitions/threat/"}
},
"threats": {"$ref": "#/definitions/threat"},
"tags": {
"type": "array",
"type": ["array", "null"],
"items": {
"type": "string"
"type": ["string", "null"]
}
},
"attributes": {"type": "object"}
"attributes": {"type": ["object", "null"]}
}
}
},
"threats": {
"type": "array",
"type": ["array", "null"],
"items": {
"type": "object",
"required": ["id", "name", "risk"],
"properties": {
"id": {"type": "string"},
"name": {"type": "string"},
"description": {"type": "string"},
"description": {"type": ["string", "null"]},
"categories": {
"type": "array",
"items": {"type": "string"}
"type": ["array", "null"],
"items": {"type": ["string", "null"]}
},
"cwes": {
"type": "array",
"items": {"type": "string"}
"type": ["array", "null"],
"items": {"type": ["string", "null"]}
},
"risk": {
"type": "object",
"required": ["likelihood", "impact"],
"properties": {
"likelihood": {"type": "number"},
"likelihoodComment": {"type": "string"},
"likelihood": {"type": ["number", "null"]},
"likelihoodComment": {"type": ["string", "null"]},
"impact": {"type": "number"},
"impactComment": {"type": "string"}
}
},
"tags": {
"type": "array",
"type": ["array", "null"],
"items": {
"type": "string"
"type": ["string", "null"]
}
},
"attributes": {"type": "object"}
"attributes": {"type": ["object", "null"]}
}
}
},
"mitigations": {
"type": "array",
"type": ["array", "null"],
"items": {
"type": "object",
"required": ["id", "name", "riskReduction"],
"properties": {
"id": {"type": "string"},
"name": {"type": "string"},
"description": {"type": "string"},
"description": {"type": ["string", "null"]},
"riskReduction": {"type": "number"},
"attributes": {"type": "object"}
"attributes": {"type": ["object", "null"]}
}
}
}
},
"definitions": {
"size": {
"type": "object",
"type": ["object", "null"],
"required": ["width", "height"],
"properties": {
"width": {"type": "number"},
Expand All @@ -235,7 +238,7 @@
}
},
"position": {
"type": "object",
"type": ["object", "null"],
"required": ["x", "y"],
"properties": {
"x": {"type": "number"},
Expand All @@ -247,14 +250,14 @@
"required": ["representation", "id"],
"properties": {
"representation": {"type": "string"},
"name": {"type": "string"},
"name": {"type": ["string", "null"]},
"id": {"type": "string"},
"position": {"$ref": "#/definitions/position"},
"size": {"$ref": "#/definitions/size"},
"file": {"type": "string"},
"line": {"type": "number"},
"codeSnippet": {"type": "string"},
"attributes": {"type": "object"}
"file": {"type": ["string", "null"]},
"line": {"type": ["number", "null"]},
"codeSnippet": {"type": ["string", "null"]},
"attributes": {"type": ["object", "null"]}
}
},
"threat": {
Expand All @@ -266,11 +269,11 @@
"mitigations": {
"type": "array",
"items": {
"type": "object",
"type": ["object", "null"],
"required": ["mitigation", "state"],
"properties": {
"mitigation": {"type": "string"},
"state": {"type": "string"}
"mitigation": {"type": ["string", "null"]},
"state": {"type": ["string", "null"]}
}
}
}
Expand Down
29 changes: 15 additions & 14 deletions setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,19 @@
'jsonschema==4.17.3',
'deepmerge==1.1.0',
'jmespath==1.0.1',
'python-hcl2==4.3.0',
'requests==2.28.2',
'fastapi==0.93.0',
'python-multipart==0.0.5',
'python-hcl2==4.3.2',
'requests==2.31.0',
'fastapi==0.95.2',
'python-multipart==0.0.6',
'click==8.1.3',
'uvicorn==0.20.0',
'uvicorn==0.22.0',
'shapely==2.0.1',
'vsdx==0.5.13',
'python-magic==0.4.27',
'setuptools==65.5.1',
'setuptools==67.8.0',
'defusedxml==0.7.1',
'networkx==3.0',
'networkx==3.1',
# Do not upgrade pygraphviz unless security issues because it is heavily dependent on the underlying OS
'pygraphviz==1.10'
],
use_scm_version={
Expand All @@ -44,13 +45,13 @@
"pytest-runner==6.0.0",
],
"test": [
'tox==4.4.6',
'pytest==7.2.2',
'coverage==7.2.3',
'responses==0.22.0',
'deepdiff==6.2.3',
'httpx==0.23.3',
'pytest-mock==3.10.0'
'tox==4.5.1',
'pytest==7.3.1',
'responses==0.23.1',
'deepdiff==6.3.0',
'httpx==0.24.1',
'pytest-mock==3.10.0',
'coverage==7.2.6'
]
},
entry_points='''
Expand Down
Loading

0 comments on commit 7d6a755

Please sign in to comment.