Skip to content

Commit

Permalink
Merge pull request #1928 from MaibornWolff/dev
Browse files Browse the repository at this point in the history 
chore: merge to main for release 1.18.1
  • Loading branch information
@StefanFl
StefanFl authored Sep 19, 2024
2 parents 6e957a0 + b76dbc5 commit b38647d
Show file tree
Hide file tree
Showing 29 changed files with 522 additions and 552 deletions.
2 changes: 1 addition & 1 deletion backend/application/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "1.18.0"
__version__ = "1.18.1"

import pymysql

Expand Down
188 changes: 101 additions & 87 deletions backend/poetry.lock
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions backend/pyproject.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "SecObserve"
version = "1.18.0"
version = "1.18.1"
description = "SecObserve is an open source vulnerability management system for software development and cloud environments."
license = "BSD-3-Clause"
authors = [
Expand Down Expand Up @@ -37,7 +37,7 @@ requests = "2.32.3" # https://github.com/psf/requests
# Database
# ------------------------------------------------------------------------------
pymysql = "1.1.1" # https://github.com/PyMySQL/PyMySQL
psycopg = { version = "3.2.1", extras = ["binary"] } # https://github.com/psycopg/psycopg
psycopg = { version = "3.2.2", extras = ["binary"] } # https://github.com/psycopg/psycopg
# Excel and CSV
# ------------------------------------------------------------------------------
defusedcsv = "2.0.0" # https://github.com/raphaelm/defusedcsv
Expand Down
2 changes: 1 addition & 1 deletion backend/unittests/vex/api/files/csaf_given_vulnerability.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"generator": {
"engine": {
"name": "SecObserve",
"version": "1.18.0"
"version": "1.18.1"
}
},
"id": "CSAF_2024_0001_0001",
Expand Down
2 changes: 1 addition & 1 deletion backend/unittests/vex/api/files/csaf_given_vulnerability_update.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"generator": {
"engine": {
"name": "SecObserve",
"version": "1.18.0"
"version": "1.18.1"
}
},
"id": "CSAF_2024_0001_0002",
Expand Down
2 changes: 1 addition & 1 deletion backend/unittests/vex/api/files/csaf_product_branches.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"generator": {
"engine": {
"name": "SecObserve",
"version": "1.18.0"
"version": "1.18.1"
}
},
"id": "CSAF_2024_0001_0001",
Expand Down
2 changes: 1 addition & 1 deletion backend/unittests/vex/api/files/csaf_product_given_branch.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"generator": {
"engine": {
"name": "SecObserve",
"version": "1.18.0"
"version": "1.18.1"
}
},
"id": "CSAF_2024_0001_0001",
Expand Down
2 changes: 1 addition & 1 deletion backend/unittests/vex/api/files/csaf_product_no_branch.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"generator": {
"engine": {
"name": "SecObserve",
"version": "1.18.0"
"version": "1.18.1"
}
},
"id": "CSAF_2024_0001_0001",
Expand Down
2 changes: 1 addition & 1 deletion backend/unittests/vex/api/files/csaf_product_no_branch_update.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"generator": {
"engine": {
"name": "SecObserve",
"version": "1.18.0"
"version": "1.18.1"
}
},
"id": "CSAF_2024_0001_0002",
Expand Down
2 changes: 1 addition & 1 deletion backend/unittests/vex/api/files/openvex_given_vulnerability.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@
}
],
"timestamp": "2020-01-01T04:30:00+00:00",
"tooling": "SecObserve / 1.18.0",
"tooling": "SecObserve / 1.18.1",
"version": 1
}
2 changes: 1 addition & 1 deletion backend/unittests/vex/api/files/openvex_given_vulnerability_update.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@
}
],
"timestamp": "2020-01-01T04:30:00+00:00",
"tooling": "SecObserve / 1.18.0",
"tooling": "SecObserve / 1.18.1",
"version": 2
}
2 changes: 1 addition & 1 deletion backend/unittests/vex/api/files/openvex_product_branches.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,6 @@
}
],
"timestamp": "2020-01-01T04:30:00+00:00",
"tooling": "SecObserve / 1.18.0",
"tooling": "SecObserve / 1.18.1",
"version": 1
}
2 changes: 1 addition & 1 deletion backend/unittests/vex/api/files/openvex_product_given_branch.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
}
],
"timestamp": "2020-01-01T04:30:00+00:00",
"tooling": "SecObserve / 1.18.0",
"tooling": "SecObserve / 1.18.1",
"version": 1
}
2 changes: 1 addition & 1 deletion backend/unittests/vex/api/files/openvex_product_no_branch.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,6 @@
}
],
"timestamp": "2020-01-01T04:30:00+00:00",
"tooling": "SecObserve / 1.18.0",
"tooling": "SecObserve / 1.18.1",
"version": 1
}
2 changes: 1 addition & 1 deletion backend/unittests/vex/api/files/openvex_product_no_branch_update.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,6 @@
}
],
"timestamp": "2020-01-01T04:30:00+00:00",
"tooling": "SecObserve / 1.18.0",
"tooling": "SecObserve / 1.18.1",
"version": 2
}
2 changes: 1 addition & 1 deletion backend/unittests/vex/services/files/so_csaf_2024_0001_0001.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"generator": {
"engine": {
"name": "SecObserve",
"version": "1.18.0"
"version": "1.18.1"
}
},
"id": "so_2024_0001_0001",
Expand Down
2 changes: 1 addition & 1 deletion backend/unittests/vex/services/files/so_csaf_2024_0001_0001_short.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"generator": {
"engine": {
"name": "SecObserve",
"version": "1.18.0"
"version": "1.18.1"
}
},
"id": "so_2024_0001_0001",
Expand Down
2 changes: 1 addition & 1 deletion backend/unittests/vex/services/files/so_openvex_2024_0001_0001.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,6 @@
}
],
"timestamp": "2024-07-14T11:17:57.668593+00:00",
"tooling": "SecObserve / 1.18.0",
"tooling": "SecObserve / 1.18.1",
"version": 1
}
6 changes: 3 additions & 3 deletions docker-compose-prod-mysql.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ networks:
services:

traefik:
image: "traefik:v3.1.2"
image: "traefik:v3.1.3"
container_name: "prod_traefik"
command:
- "--log.level=INFO"
Expand All @@ -35,7 +35,7 @@ services:
- traefik

frontend:
image: maibornwolff/secobserve-frontend:1.18.0
image: maibornwolff/secobserve-frontend:1.18.1
container_name: "prod_secobserve_frontend"
labels:
- "traefik.enable=true"
Expand All @@ -54,7 +54,7 @@ services:
- traefik

backend:
image: maibornwolff/secobserve-backend:1.18.0
image: maibornwolff/secobserve-backend:1.18.1
container_name: "prod_secobserve_backend"
labels:
- "traefik.enable=true"
Expand Down
6 changes: 3 additions & 3 deletions docker-compose-prod-postgres.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ networks:
services:

traefik:
image: "traefik:v3.1.2"
image: "traefik:v3.1.3"
container_name: "prod_traefik"
command:
- "--log.level=INFO"
Expand All @@ -35,7 +35,7 @@ services:
- traefik

frontend:
image: maibornwolff/secobserve-frontend:1.18.0
image: maibornwolff/secobserve-frontend:1.18.1
container_name: "prod_secobserve_frontend"
labels:
- "traefik.enable=true"
Expand All @@ -54,7 +54,7 @@ services:
- traefik

backend:
image: maibornwolff/secobserve-backend:1.18.0
image: maibornwolff/secobserve-backend:1.18.1
container_name: "prod_secobserve_backend"
labels:
- "traefik.enable=true"
Expand Down
4 changes: 2 additions & 2 deletions docs/getting_started/installation.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ services:
- default

frontend:
image: maibornwolff/secobserve-frontend:1.18.0
image: maibornwolff/secobserve-frontend:1.18.1
labels:
- "traefik.enable=true"
- "traefik.http.routers.frontend.rule=Host(`secobserve.localhost`)"
Expand All @@ -62,7 +62,7 @@ services:
- traefik

backend:
image: maibornwolff/secobserve-backend:1.18.0
image: maibornwolff/secobserve-backend:1.18.1
labels:
- "traefik.enable=true"
- "traefik.http.routers.backend.rule=Host(`secobserve-backend.localhost`)"
Expand Down
4 changes: 2 additions & 2 deletions end_to_end_tests/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion end_to_end_tests/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "end_to_end_tests",
"version": "1.18.0",
"version": "1.18.1",
"private": true,
"description": "",
"main": "index.js",
Expand Down
Loading

0 comments on commit b38647d

Please sign in to comment.