New Upstream Release - gsad
Ready changes
Summary
Merged new upstream version: 22.5.1 (was: 22.4.1).
Diff
diff --git a/.docker/build.Dockerfile b/.docker/build.Dockerfile
index 289b0ef..44e0feb 100644
--- a/.docker/build.Dockerfile
+++ b/.docker/build.Dockerfile
@@ -1,8 +1,8 @@
# Define ARG we use through the build
-ARG VERSION=stable
+ARG GVM_LIBS_VERSION=oldstable
# We want gvm-libs to be ready so we use the build docker image of gvm-libs
-FROM greenbone/gvm-libs:$VERSION
+FROM greenbone/gvm-libs:$GVM_LIBS_VERSION
# This will make apt-get install without question
ARG DEBIAN_FRONTEND=noninteractive
diff --git a/.docker/prod.Dockerfile b/.docker/prod.Dockerfile
index 278429e..fdff439 100644
--- a/.docker/prod.Dockerfile
+++ b/.docker/prod.Dockerfile
@@ -1,4 +1,5 @@
ARG VERSION=stable
+ARG GVM_LIBS_VERSION=oldstable
ARG DEBIAN_FRONTEND=noninteractive
FROM greenbone/gsad-build:${VERSION} as builder
@@ -26,7 +27,7 @@ RUN mkdir /build \
&& cmake -DCMAKE_BUILD_TYPE=Release /source \
&& make DESTDIR=/install install
-FROM greenbone/gvm-libs:${VERSION}
+FROM greenbone/gvm-libs:${GVM_LIBS_VERSION}
ARG DEBIAN_FRONTEND=noninteractive
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 85dac03..2277dec 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,6 +1,6 @@
# default reviewers
-* @greenbone/gvmd-maintainers
+* @greenbone/gvmd-maintainers @mattmundell
# dev ops
-.github/ @greenbone/devops @greenbone/gvmd-maintainers
-.docker/ @greenbone/devops @greenbone/gvmd-maintainers
+.github/ @greenbone/devops @greenbone/gvmd-maintainers @mattmundell
+.docker/ @greenbone/devops @greenbone/gvmd-maintainers @mattmundell
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644
index ef7b982..0000000
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -1,34 +0,0 @@
-**What**:
-
-<!--
- Describe what changes are being made, e.g. which feature/bug is being
- developed/fixed in this PR?
--->
-
-**Why**:
-
-<!-- Why are these changes necessary? -->
-
-**How**:
-
-<!--
- How did you verify the changes in this PR?
- If this PR contains tests this section can be considered done.
- Otherwise please write down the steps on how you did test your changes and
- verified that the changes are working as expected.
-
- See https://www.ministryoftesting.com/dojo/lessons/community-stories-to-shift-left-start-right
- for some background.
- -->
-
-**Checklist**:
-
-<!-- add labels for ports to additional branches -->
-
-<!-- add "N/A" to the end of each line not applicable to your changes -->
-
-<!-- to check an item, place an "x" in the box like so: "- [x] Tests" -->
-
-- [ ] Tests
-- [ ] [CHANGELOG](https://github.com/greenbone/gsa/blob/master/CHANGELOG.md) Entry
-- [ ] Labels for ports to other branches
diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml
index 5c56783..0917e44 100644
--- a/.github/workflows/build-container.yml
+++ b/.github/workflows/build-container.yml
@@ -2,13 +2,15 @@ name: Build Container Image Builds
on:
push:
- branches: [ main, stable, oldstable ]
+ branches:
+ - main
tags: ["v*"]
paths:
- .github/workflows/build-container.yml
- .docker/build.Dockerfile
pull_request:
- branches: [ main, stable, oldstable ]
+ branches:
+ - main
paths:
- .github/workflows/build-container.yml
- .docker/build.Dockerfile
@@ -20,11 +22,15 @@ on:
jobs:
build-images:
- name: Build images for building gsad
+ name: "Build Images"
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+ - uses: greenbone/actions/is-latest-tag@v2
+ id: latest
- name: Setup container meta information
id: meta
uses: docker/metadata-action@v4
@@ -35,33 +41,46 @@ jobs:
org.opencontainers.image.base.name=greenbone/gvm-libs
flavor: latest=false # no latest container tag for git tags
tags: |
- # create container tag for git tags
- type=ref,event=tag
+ # use version, major.minor and major for tags
+ type=semver,pattern={{version}}
+ type=semver,pattern={{major}}.{{minor}}
+ type=semver,pattern={{major}}
+
+ # use edge for default branch
+ type=edge
+
+ # set label for non-published pull request builds
type=ref,event=pr
- # use latest for stable branch
- type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'stable') }}
- type=raw,value=stable,enable=${{ github.ref == format('refs/heads/{0}', 'stable') }}
- type=raw,value=oldstable,enable=${{ github.ref == format('refs/heads/{0}', 'oldstable') }}
- # use unstable for main branch
- type=raw,value=unstable,enable={{is_default_branch}}
- - name: Set up Docker Buildx
- uses: docker/setup-buildx-action@v1
+
+ # when a new git tag is created set stable and a latest tags
+ type=raw,value=latest,enable=${{ steps.latest.outputs.is-latest-tag == 'true' }}
+ type=raw,value=stable,enable=${{ steps.latest.outputs.is-latest-tag == 'true' }}
+ - name: Set container build options
+ id: container-opts
+ run: |
+ if [[ "${{ github.ref_type }}" = 'tag' ]]; then
+ echo "gvm-libs-version=oldstable" >> $GITHUB_OUTPUT
+ else
+ echo "gvm-libs-version=oldstable-edge" >> $GITHUB_OUTPUT
+ fi
- name: Login to DockerHub
if: github.event_name != 'pull_request'
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- - run: echo "Build and push ${{ steps.container.outputs.image-tags }}"
+ - run: echo "Build and push ${{ steps.meta.outputs.tags }}"
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Build and push
- uses: docker/build-push-action@v3
+ uses: docker/build-push-action@v4
with:
context: .
push: ${{ github.event_name != 'pull_request' }}
+ build-args: |
+ GVM_LIBS_VERSION=${{ steps.container-opts.outputs.gvm-libs-version }}
file: .docker/build.Dockerfile
platforms: linux/amd64,linux/arm64
tags: ${{ steps.meta.outputs.tags }}
diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
index a8fc713..514fa93 100644
--- a/.github/workflows/container.yml
+++ b/.github/workflows/container.yml
@@ -2,20 +2,25 @@ name: Container Image Builds
on:
push:
- branches: [main, stable, oldstable]
+ branches:
+ - main
tags: ["v*"]
pull_request:
- branches: [main, stable, oldstable]
+ branches:
+ - main
workflow_dispatch:
- repository_dispatch:
jobs:
images:
- name: Production Images
+ name: Build and upload container images
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+ - uses: greenbone/actions/is-latest-tag@v2
+ id: latest
- name: Setup container meta information
id: meta
uses: docker/metadata-action@v4
@@ -24,22 +29,32 @@ jobs:
labels: |
org.opencontainers.image.vendor=Greenbone
org.opencontainers.image.base.name=greenbone/gvm-libs
- flavor: latest=false # no auto latest container tag for git tags
+ flavor: latest=false # no latest container tag for git tags
tags: |
- # use container tag for git tags
- type=match,pattern=v(.*),group=1
- # use latest for latest tag from stable branch
- type=raw,value=latest,enable=${{ github.ref_type == 'tag' && startsWith(github.ref_name, 'v22.4') }}
- # use stable for latest 22.4 tag
- type=raw,value=stable,enable=${{ github.ref_type == 'tag' && startsWith(github.ref_name, 'v22.4') }}
- # use oldstable for latest 21.4 tag
- type=raw,value=oldstable,enable=${{ github.ref_type == 'tag' && startsWith(github.ref_name, 'v21.4') }}
+ # use version, major.minor and major for tags
+ type=semver,pattern={{version}}
+ type=semver,pattern={{major}}.{{minor}}
+ type=semver,pattern={{major}}
+
# use edge for default branch
type=edge
- # use branch-sha otherwise for pushes to branches other then main (will not be uploaded)
- type=raw,value={{branch}}-{{sha}},enable=${{ github.ref_type == 'branch' && github.event_name == 'push' && github.ref_name != 'main' }}
- # use pr-$PR_ID for pull requests (will not be uploaded)
+
+ # set label for non-published pull request builds
type=ref,event=pr
+
+ # when a new git tag is created set stable and a latest tags
+ type=raw,value=latest,enable=${{ steps.latest.outputs.is-latest-tag == 'true' }}
+ type=raw,value=stable,enable=${{ steps.latest.outputs.is-latest-tag == 'true' }}
+ - name: Set container build options
+ id: container-opts
+ run: |
+ if [[ "${{ github.ref_type }}" = 'tag' ]]; then
+ echo "version=stable" >> $GITHUB_OUTPUT
+ echo "gvm-libs-version=oldstable" >> $GITHUB_OUTPUT
+ else
+ echo "version=edge" >> $GITHUB_OUTPUT
+ echo "gvm-libs-version=oldstable-edge" >> $GITHUB_OUTPUT
+ fi
- name: Login to Docker Registry
if: github.event_name != 'pull_request'
uses: docker/login-action@v2
@@ -51,10 +66,13 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Build and push Container image
- uses: docker/build-push-action@v3
+ uses: docker/build-push-action@v4
with:
context: .
push: ${{ github.event_name != 'pull_request' && (github.ref_type == 'tag' || github.ref_name == 'main') }}
+ build-args: |
+ VERSION=${{ steps.container-opts.outputs.version }}
+ GVM_LIBS_VERSION=${{ steps.container-opts.outputs.gvm-libs-version }}
file: .docker/prod.Dockerfile
platforms: linux/amd64,linux/arm64
tags: ${{ steps.meta.outputs.tags }}
diff --git a/.github/workflows/conventional-commits.yml b/.github/workflows/conventional-commits.yml
new file mode 100644
index 0000000..68793a2
--- /dev/null
+++ b/.github/workflows/conventional-commits.yml
@@ -0,0 +1,12 @@
+name: Conventional Commits
+
+on:
+ pull_request:
+
+jobs:
+ conventional-commits:
+ name: Conventional Commits
+ runs-on: ubuntu-latest
+ steps:
+ - name: Report Conventional Commits
+ uses: greenbone/actions/conventional-commits@v2
diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
new file mode 100644
index 0000000..bbc5a50
--- /dev/null
+++ b/.github/workflows/dependency-review.yml
@@ -0,0 +1,12 @@
+name: 'Dependency Review'
+on: [pull_request]
+
+permissions:
+ contents: read
+
+jobs:
+ dependency-review:
+ runs-on: ubuntu-latest
+ steps:
+ - name: 'Dependency Review'
+ uses: greenbone/actions/dependency-review@v2
diff --git a/.github/workflows/release-pontos-manually.yml b/.github/workflows/release-pontos-manually.yml
deleted file mode 100644
index 08efeff..0000000
--- a/.github/workflows/release-pontos-manually.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: Manual gsad patch
-
-on:
- workflow_dispatch:
- inputs:
- branch:
- description: 'Branch'
- required: true
- default: 'main'
-
-jobs:
- build-and-release:
- name: Release patch manually
- runs-on: 'ubuntu-latest'
- steps:
- - name: Release with release action
- uses: greenbone/actions/release@v1
- with:
- ref: ${{ github.event.inputs.branch }}
- github-user: ${{ secrets.GREENBONE_BOT }}
- github-user-mail: ${{ secrets.GREENBONE_BOT_MAIL }}
- github-user-token: ${{ secrets.GREENBONE_BOT_TOKEN }}
- gpg-key: ${{ secrets.GPG_KEY }}
- gpg-fingerprint: ${{ secrets.GPG_FINGERPRINT }}
- gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }}
diff --git a/.github/workflows/release-pontos.yml b/.github/workflows/release-pontos.yml
new file mode 100644
index 0000000..fd43d70
--- /dev/null
+++ b/.github/workflows/release-pontos.yml
@@ -0,0 +1,55 @@
+name: Release gsad
+
+on:
+ pull_request:
+ types: [closed]
+ workflow_dispatch:
+ inputs:
+ release-type:
+ type: choice
+ description: What kind of release do you want to do (pontos --release-type argument)?
+ options:
+ - patch
+ - minor
+ - major
+ release-version:
+ type: string
+ description: Set an explicit version, that will overwrite release-type. Fails if version is not compliant.
+
+jobs:
+ build-and-release:
+ name: Create a new release
+ # If the event is a workflow_dispatch or on of the labels 'pre release',
+ # 'patch release', 'minor release' or 'major release' is set and PR is
+ # closed because of a merge
+ # NOTE: priority of set labes will be alpha > release-candidate > patch > minor > major,
+ # so if 'major' and 'patch' labes are set, it will create a patch release.
+ if: |
+ ( github.event_name == 'workflow_dispatch') || (
+ ( contains(github.event.pull_request.labels.*.name, 'alpha release') ||
+ contains(github.event.pull_request.labels.*.name, 'rc release') ||
+ contains(github.event.pull_request.labels.*.name, 'patch release') ||
+ contains(github.event.pull_request.labels.*.name, 'minor release') ||
+ contains(github.event.pull_request.labels.*.name, 'major release')) &&
+ github.event.pull_request.merged == true )
+ runs-on: 'ubuntu-latest'
+ steps:
+ - name: Selecting the Release type
+ id: release-type
+ uses: greenbone/actions/release-type@v2
+ with:
+ release-type-input: ${{ inputs.release-type }}
+ - name: Release with release action
+ uses: greenbone/actions/release@v2
+ with:
+ python-version: "3.10"
+ github-user: ${{ secrets.GREENBONE_BOT }}
+ github-user-mail: ${{ secrets.GREENBONE_BOT_MAIL }}
+ github-user-token: ${{ secrets.GREENBONE_BOT_TOKEN }}
+ gpg-key: ${{ secrets.GPG_KEY }}
+ gpg-fingerprint: ${{ secrets.GPG_FINGERPRINT }}
+ gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }}
+ release-type: ${{ steps.release-type.outputs.release-type }}
+ release-version: ${{ inputs.release-version }}
+ ref: ${{ steps.release-type.outputs.release-ref }}
+ versioning-scheme: "semver"
diff --git a/.github/workflows/sbom-upload.yml b/.github/workflows/sbom-upload.yml
new file mode 100644
index 0000000..28289bd
--- /dev/null
+++ b/.github/workflows/sbom-upload.yml
@@ -0,0 +1,14 @@
+name: SBOM upload
+on:
+ workflow_dispatch:
+ push:
+ branches: ["main"]
+jobs:
+ SBOM-upload:
+ runs-on: ubuntu-latest
+ permissions:
+ id-token: write
+ contents: write
+ steps:
+ - name: 'SBOM upload'
+ uses: greenbone/actions/sbom-upload@v2
diff --git a/.venv/lib/python3.9/site-packages/httpx/__version__.py b/.venv/lib/python3.9/site-packages/httpx/__version__.py
deleted file mode 100644
index c8823f3..0000000
--- a/.venv/lib/python3.9/site-packages/httpx/__version__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-__title__ = "httpx"
-__description__ = "A next generation HTTP client, for Python 3."
-__version__ = "0.23.3"
diff --git a/.venv/lib/python3.9/site-packages/pip/_vendor/requests/__version__.py b/.venv/lib/python3.9/site-packages/pip/_vendor/requests/__version__.py
deleted file mode 100644
index e725ada..0000000
--- a/.venv/lib/python3.9/site-packages/pip/_vendor/requests/__version__.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# .-. .-. .-. . . .-. .-. .-. .-.
-# |( |- |.| | | |- `-. | `-.
-# ' ' `-' `-`.`-' `-' `-' ' `-'
-
-__title__ = "requests"
-__description__ = "Python HTTP for Humans."
-__url__ = "https://requests.readthedocs.io"
-__version__ = "2.28.1"
-__build__ = 0x022801
-__author__ = "Kenneth Reitz"
-__author_email__ = "me@kennethreitz.org"
-__license__ = "Apache 2.0"
-__copyright__ = "Copyright 2022 Kenneth Reitz"
-__cake__ = "\u2728 \U0001f370 \u2728"
diff --git a/.venv/lib/python3.9/site-packages/pontos/version/__version__.py b/.venv/lib/python3.9/site-packages/pontos/version/__version__.py
deleted file mode 100644
index d8f7e2a..0000000
--- a/.venv/lib/python3.9/site-packages/pontos/version/__version__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-# pylint: disable=invalid-name
-
-# THIS IS AN AUTOGENERATED FILE. DO NOT TOUCH!
-
-__version__ = "22.12.3"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4263edf..651036d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 Greenbone Networks GmbH
+# Copyright (C) 2017-2021 Greenbone AG
#
# SPDX-License-Identifier: AGPL-3.0-or-later
#
@@ -20,7 +20,7 @@ cmake_minimum_required (VERSION 3.0)
message ("-- Configuring gsad")
-project (gsad VERSION 22.4.1 LANGUAGES C)
+project (gsad VERSION 22.5.1 LANGUAGES C)
if (NOT DEFINED PROJECT_VERSION_STRING)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
diff --git a/README.md b/README.md
index 91e6811..74d05a0 100644
--- a/README.md
+++ b/README.md
@@ -204,6 +204,6 @@ github](https://github.com/greenbone/gsad/issues) first.
## License
-Copyright (C) 2009-2022 [Greenbone Networks GmbH](https://www.greenbone.net/)
+Copyright (C) 2009-2022 [Greenbone AG](https://www.greenbone.net/)
Licensed under the [GNU Affero General Public License v3.0 or later](LICENSE).
diff --git a/changelog/v22.4.1.md b/changelog/v22.4.1.md
deleted file mode 100644
index df9ab94..0000000
--- a/changelog/v22.4.1.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file.
-
-## [22.4.1] - 2023-01-09
-
-## Added
-* Add tests for "name" and "comment" field validations [805a89b95](https://github.com/greenbone/gsad/commit/805a89b95)
-* Add libcgreen1-dev package to build container [649ee79d6](https://github.com/greenbone/gsad/commit/649ee79d6)
-
-## Changed
-* Build and run unit tests on CI [eb8737054](https://github.com/greenbone/gsad/commit/eb8737054)
-* Enable testing in main CMakeLists.txt file [64725e7d3](https://github.com/greenbone/gsad/commit/64725e7d3)
-* Use different return values for gvm_validate [66c7165fc](https://github.com/greenbone/gsad/commit/66c7165fc)
-* Extract initializing the validators int own C file [8200fb6c5](https://github.com/greenbone/gsad/commit/8200fb6c5)
-* Update creating tags for container images [c651d9fb7](https://github.com/greenbone/gsad/commit/c651d9fb7)
-* Change service start up type from forking to exec (#84) [34534c530](https://github.com/greenbone/gsad/commit/34534c530)
-* Split creating build and production container images [baf2e6f8d](https://github.com/greenbone/gsad/commit/baf2e6f8d)
-* Build container images for pull requests too [ccd85d084](https://github.com/greenbone/gsad/commit/ccd85d084)
-* Use docker/meta-action for container tags and labels [1cb1f253c](https://github.com/greenbone/gsad/commit/1cb1f253c)
-
-## Bug Fixes
-* Initialize libgcrypt only once [8abfc8c4b](https://github.com/greenbone/gsad/commit/8abfc8c4b)
-* Allow brackets and en dash Unicode character in name and comment fields [22c123603](https://github.com/greenbone/gsad/commit/22c123603)
-* Fix regex for new glib2.0 >= 2.73.2 [2100433f6](https://github.com/greenbone/gsad/commit/2100433f6)
-
-[22.4.1]: https://github.com/greenbone/gsad/compare/v9.0.1...22.4.1
\ No newline at end of file
diff --git a/changelog/22.4.0.md b/changelog/v22.4.md
similarity index 94%
rename from changelog/22.4.0.md
rename to changelog/v22.4.md
index 8125d8c..cd44cf8 100644
--- a/changelog/22.4.0.md
+++ b/changelog/v22.4.md
@@ -2,7 +2,7 @@
All notable changes to this project will be documented in this file.
-## [22.4.0] - 2022-07-22
+## [22.4] - 2022-07-19
## Removed
* Removing the OSP scanners in gsad [#13] [aa1a85dcb](https://github.com/greenbone/gsad/commit/aa1a85dcb)
@@ -22,4 +22,4 @@ All notable changes to this project will be documented in this file.
* Use correct PID path in service file [fbaa81646](https://github.com/greenbone/gsad/commit/fbaa81646)
* severity field within gmp_authenticate_info_opts_t got deleted [50a9326b1](https://github.com/greenbone/gsad/commit/50a9326b1)
-[22.4.0]: https://github.com/greenbone/gsad/compare/v21.4.4...v22.4.0
+[22.4]: https://github.com/greenbone/gsad/compare/22.4...22.4
diff --git a/cmake/GetGit.cmake b/cmake/GetGit.cmake
index afc53b3..fab4939 100644
--- a/cmake/GetGit.cmake
+++ b/cmake/GetGit.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2021 Greenbone Networks GmbH
+# Copyright (C) 2018-2021 Greenbone AG
#
# SPDX-License-Identifier: GPL-2.0-or-later
#
diff --git a/cmake/ProjectVersion.cmake b/cmake/ProjectVersion.cmake
index a9056c5..e8aff00 100644
--- a/cmake/ProjectVersion.cmake
+++ b/cmake/ProjectVersion.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2021 Greenbone Networks GmbH
+# Copyright (C) 2020-2021 Greenbone AG
#
# SPDX-License-Identifier: GPL-2.0-or-later
#
diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
index 2e8b4cb..75fefdc 100644
--- a/config/CMakeLists.txt
+++ b/config/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2019-2021 Greenbone Networks GmbH
+# Copyright (C) 2019-2021 Greenbone AG
#
# SPDX-License-Identifier: AGPL-3.0-or-later
#
diff --git a/debian/changelog b/debian/changelog
index ef48881..187dcdd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gsad (22.5.1-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk> Thu, 10 Aug 2023 04:37:45 -0000
+
gsad (22.4.1-1) unstable; urgency=medium
* New upstream version 22.4.1
diff --git a/debian/patches/adapt-gsad-service.patch b/debian/patches/adapt-gsad-service.patch
index 8fb46f1..6f2362f 100644
--- a/debian/patches/adapt-gsad-service.patch
+++ b/debian/patches/adapt-gsad-service.patch
@@ -10,10 +10,10 @@ Forwarded: not-needed
config/gsad.service.in | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
-diff --git a/config/gsad.service.in b/config/gsad.service.in
-index 8d6883b..5a14b42 100644
---- a/config/gsad.service.in
-+++ b/config/gsad.service.in
+Index: gsad.git/config/gsad.service.in
+===================================================================
+--- gsad.git.orig/config/gsad.service.in
++++ gsad.git/config/gsad.service.in
@@ -6,11 +6,12 @@ Wants=gvmd.service
[Service]
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 46be51a..615eb3e 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2021 Greenbone Networks GmbH#
+# Copyright (C) 2009-2021 Greenbone AG#
# SPDX-License-Identifier: AGPL-3.0-or-later
#
# This program is free software: you can redistribute it and/or modify
diff --git a/doc/gsad.8.xml b/doc/gsad.8.xml
index 7f77737..3402168 100644
--- a/doc/gsad.8.xml
+++ b/doc/gsad.8.xml
@@ -3,7 +3,7 @@
<?xml-stylesheet type="text/xsl" href="/usr/share/xmltoman/xmltoman.xsl" ?>
<!--
-Copyright (C) 2011-2018 Greenbone Networks GmbH
+Copyright (C) 2011-2018 Greenbone AG
SPDX-License-Identifier: GPL-2.0-or-later
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b2ed01e..f7f90e6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2021 Greenbone Networks GmbH#
+# Copyright (C) 2009-2021 Greenbone AG#
# SPDX-License-Identifier: AGPL-3.0-or-later
#
# This program is free software: you can redistribute it and/or modify
@@ -26,9 +26,9 @@ endif (NOT PKG_CONFIG_FOUND)
pkg_check_modules (LIBMICROHTTPD REQUIRED libmicrohttpd>=0.9.0)
pkg_check_modules (LIBXML REQUIRED libxml-2.0)
pkg_check_modules (GLIB REQUIRED glib-2.0>=2.42)
-pkg_check_modules (LIBGVM_BASE REQUIRED libgvm_base>=10.0.0)
-pkg_check_modules (LIBGVM_UTIL REQUIRED libgvm_util>=10.0.0)
-pkg_check_modules (LIBGVM_GMP REQUIRED libgvm_gmp>=10.0.0)
+pkg_check_modules (LIBGVM_BASE REQUIRED libgvm_base>=22.6)
+pkg_check_modules (LIBGVM_UTIL REQUIRED libgvm_util>=22.6)
+pkg_check_modules (LIBGVM_GMP REQUIRED libgvm_gmp>=22.6)
pkg_check_modules (GNUTLS REQUIRED gnutls>=3.2.15)
message (STATUS "Looking for libgcrypt...")
diff --git a/src/gsad.c b/src/gsad.c
index 1ad52c2..3d9fb74 100644
--- a/src/gsad.c
+++ b/src/gsad.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2021 Greenbone Networks GmbH
+/* Copyright (C) 2009-2021 Greenbone AG
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*
@@ -179,7 +179,7 @@
#define DEFAULT_GSAD_PER_IP_CONNECTION_LIMIT 30
#define COPYRIGHT \
- "Copyright (C) 2010 - 2021 Greenbone Networks GmbH\n" \
+ "Copyright (C) 2010 - 2021 Greenbone AG\n" \
"License: AGPL-3.0-or-later\n" \
"This is free software: you are free to change and redistribute it.\n" \
"There is NO WARRANTY, to the extent permitted by law.\n\n"
diff --git a/src/gsad_base.c b/src/gsad_base.c
index 76bdc8f..1c2fd7f 100644
--- a/src/gsad_base.c
+++ b/src/gsad_base.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2021 Greenbone Networks GmbH
+/* Copyright (C) 2009-2021 Greenbone AG
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*
diff --git a/src/gsad_base.h b/src/gsad_base.h
index d01c46c..43299b1 100644
--- a/src/gsad_base.h
+++ b/src/gsad_base.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2021 Greenbone Networks GmbH
+/* Copyright (C) 2009-2021 Greenbone AG
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*
diff --git a/src/gsad_cmd.c b/src/gsad_cmd.c
index fee80a2..350a70d 100644
--- a/src/gsad_cmd.c
+++ b/src/gsad_cmd.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016-2021 Greenbone Networks GmbH
+/* Copyright (C) 2016-2021 Greenbone AG
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*
diff --git a/src/gsad_cmd.h b/src/gsad_cmd.h
index 68519f0..7729fa0 100644
--- a/src/gsad_cmd.h
+++ b/src/gsad_cmd.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016-2021 Greenbone Networks GmbH
+/* Copyright (C) 2016-2021 Greenbone AG
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*
diff --git a/src/gsad_content_type.h b/src/gsad_content_type.h
index 5a12a2e..f6f41d7 100644
--- a/src/gsad_content_type.h
+++ b/src/gsad_content_type.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016-2021 Greenbone Networks GmbH
+/* Copyright (C) 2016-2021 Greenbone AG
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*
diff --git a/src/gsad_credentials.c b/src/gsad_credentials.c
index c0cdb2b..613a6e2 100644
--- a/src/gsad_credentials.c
+++ b/src/gsad_credentials.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018-2021 Greenbone Networks GmbH
+/* Copyright (C) 2018-2021 Greenbone AG
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*
diff --git a/src/gsad_credentials.h b/src/gsad_credentials.h
index 0f60e02..2a4849a 100644
--- a/src/gsad_credentials.h
+++ b/src/gsad_credentials.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018-2021 Greenbone Networks GmbH
+/* Copyright (C) 2018-2021 Greenbone AG
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*
diff --git a/src/gsad_gmp.c b/src/gsad_gmp.c
index 1b39da3..38372d7 100644
--- a/src/gsad_gmp.c
+++ b/src/gsad_gmp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2021 Greenbone Networks GmbH
+/* Copyright (C) 2009-2021 Greenbone AG
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*
@@ -94,7 +94,11 @@
* @brief HTTP status code for expected failure of gmp requests e.g. if some
* parameter was missing or invalid.
*/
+#if MHD_VERSION < 0x00097400
#define GSAD_STATUS_INVALID_REQUEST MHD_HTTP_UNPROCESSABLE_ENTITY
+#else
+#define GSAD_STATUS_INVALID_REQUEST MHD_HTTP_UNPROCESSABLE_CONTENT
+#endif
/**
* @brief Initial filtered results per page on the report summary.
@@ -4460,6 +4464,7 @@ append_alert_method_data (GString *xml, params_t *data, const char *method,
|| (strcmp (method, "SMB") == 0
&& (strcmp (name, "smb_credential") == 0
|| strcmp (name, "smb_file_path") == 0
+ || strcmp (name, "smb_max_protocol") == 0
|| strcmp (name, "smb_report_format") == 0
|| strcmp (name, "smb_share_path") == 0))
|| (strcmp (method, "SNMP") == 0
@@ -14747,11 +14752,17 @@ save_auth_gmp (gvm_connection_t *connection, credentials_t *credentials,
CHECK_VARIABLE_INVALID (method, "Save Authentication");
if (!strcmp (method, "method:ldap_connect"))
{
- const char *ldaphost, *authdn, *certificate;
+ const char *ldaphost, *authdn, *certificate, *ldaps_only;
ldaphost = params_value (params, "ldaphost");
authdn = params_value (params, "authdn");
certificate = params_value (params, "certificate");
+ if (params_value (params, "ldaps_only")
+ && (strcmp (params_value (params, "ldaps_only"), "1") == 0))
+ ldaps_only = "true";
+ else
+ ldaps_only = "false";
+
CHECK_VARIABLE_INVALID (ldaphost, "Save Authentication");
CHECK_VARIABLE_INVALID (authdn, "Save Authentication");
if (params_given (params, "certificate") && strcmp (certificate, ""))
@@ -14764,19 +14775,22 @@ save_auth_gmp (gvm_connection_t *connection, credentials_t *credentials,
"<group name=\"%s\">" AUTH_CONF_SETTING ("enable", "%s")
AUTH_CONF_SETTING ("ldaphost", "%s")
AUTH_CONF_SETTING ("authdn", "%s")
- AUTH_CONF_SETTING ("cacert", "%s") "</group>"
- "</modify_auth>",
- method, truefalse, ldaphost, authdn, certificate);
+ AUTH_CONF_SETTING ("ldaps-only", "%s")
+ AUTH_CONF_SETTING ("cacert", "%s") "</group>"
+ "</modify_auth>",
+ method, truefalse, ldaphost, authdn, ldaps_only, certificate);
}
else
/** @warning authdn shall contain a single %s, handle with care. */
- ret = gmpf (connection, credentials, &response, &entity, response_data,
- "<modify_auth>"
- "<group name=\"%s\">" AUTH_CONF_SETTING ("enable", "%s")
- AUTH_CONF_SETTING ("ldaphost", "%s")
- AUTH_CONF_SETTING ("authdn", "%s") "</group>"
- "</modify_auth>",
- method, truefalse, ldaphost, authdn);
+ ret =
+ gmpf (connection, credentials, &response, &entity, response_data,
+ "<modify_auth>"
+ "<group name=\"%s\">" AUTH_CONF_SETTING ("enable", "%s")
+ AUTH_CONF_SETTING ("ldaphost", "%s")
+ AUTH_CONF_SETTING ("authdn", "%s")
+ AUTH_CONF_SETTING ("ldaps-only", "%s") "</group>"
+ "</modify_auth>",
+ method, truefalse, ldaphost, authdn, ldaps_only);
}
else if (!strcmp (method, "method:radius_connect"))
{
@@ -16812,6 +16826,92 @@ authenticate_gmp (const gchar *username, const gchar *password, gchar **role,
}
}
+/**
+ * @brief Check authentication credentials.
+ *
+ * @param[in] username Username.
+ * @param[in] password Password.
+ * @param[out] role Role.
+ * @param[out] timezone Timezone.
+ * @param[out] capabilities Capabilities of manager.
+ * @param[out] language User Interface Language, or NULL.
+ * @param[out] pw_warning Password warning message, NULL if password is OK.
+ *
+ * @return 0 success, 1 manager down, 2 failed, 3 timeout, -1 error.
+ */
+int
+logout_gmp (const gchar *username, const gchar *password)
+{
+ gvm_connection_t connection;
+ int ret;
+ gmp_authenticate_info_opts_t auth_opts;
+
+ entity_t entity;
+ const char *status;
+
+ gchar *response;
+
+ if (gvm_connection_open (&connection, manager_address, manager_port))
+ {
+ g_debug ("%s failed to acquire socket!\n", __func__);
+ return 1;
+ }
+
+ auth_opts = gmp_authenticate_info_opts_defaults;
+ auth_opts.username = username;
+ auth_opts.password = password;
+ auth_opts.role = NULL;
+ auth_opts.timezone = NULL;
+ auth_opts.pw_warning = NULL;
+
+ ret = gmp_authenticate_info_ext_c (&connection, auth_opts);
+ if (ret)
+ {
+ gvm_connection_close (&connection);
+
+ switch (ret)
+ {
+ case 1: /* manager closed connection */
+ case 2: /* auth failed */
+ case 3: /* timeout */
+ return ret;
+ default:
+ return -1;
+ }
+ }
+
+ ret = gvm_connection_sendf_xml (&connection, "<logout/>");
+ if (ret)
+ {
+ gvm_connection_close (&connection);
+ return -1;
+ }
+
+ entity = NULL;
+ if (read_entity_and_text_c (&connection, &entity, &response))
+ {
+ gvm_connection_close (&connection);
+ return 1;
+ }
+
+ gvm_connection_close (&connection);
+
+ status = entity_attribute (entity, "status");
+ if ((status == NULL) || (strlen (status) == 0))
+ {
+ free_entity (entity);
+ return -1;
+ }
+ else if (status[0] == '2')
+ {
+ free_entity (entity);
+ return 2;
+ }
+
+ free_entity (entity);
+ return 0;
+}
+
/**
* @brief Login and create a session
*
diff --git a/src/gsad_gmp.h b/src/gsad_gmp.h
index b781efa..e77d1b0 100644
--- a/src/gsad_gmp.h
+++ b/src/gsad_gmp.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2021 Greenbone Networks GmbH
+/* Copyright (C) 2009-2021 Greenbone AG
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*
diff --git a/src/gsad_gmp_arguments.c b/src/gsad_gmp_arguments.c
index 5d4f735..c57f3f9 100644
--- a/src/gsad_gmp_arguments.c
+++ b/src/gsad_gmp_arguments.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2019-2021 Greenbone Networks GmbH
+/* Copyright (C) 2019-2021 Greenbone AG
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*
diff --git a/src/gsad_gmp_arguments.h b/src/gsad_gmp_arguments.h
index e70afb2..eea6b9a 100644
--- a/src/gsad_gmp_arguments.h
+++ b/src/gsad_gmp_arguments.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2019-2021 Greenbone Networks GmbH
+/* Copyright (C) 2019-2021 Greenbone AG
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*
diff --git a/src/gsad_gmp_auth.h b/src/gsad_gmp_auth.h
index 1985590..a8edf8d 100644
--- a/src/gsad_gmp_auth.h
+++ b/src/gsad_gmp_auth.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016-2021 Greenbone Networks GmbH
+/* Copyright (C) 2016-2021 Greenbone AG
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*
@@ -30,4 +30,7 @@ int
authenticate_gmp (const gchar *, const gchar *, gchar **, gchar **, gchar **,
gchar **, gchar **, gchar **);
+int
+logout_gmp (const gchar *username, const gchar *password);
+
#endif /* _GSAD_GMP_AUTH_H */
diff --git a/src/gsad_gmp_request.c b/src/gsad_gmp_request.c
index 4e99dae..b48b288 100644
--- a/src/gsad_gmp_request.c
+++ b/src/gsad_gmp_request.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2019-2021 Greenbone Networks GmbH
+/* Copyright (C) 2019-2021 Greenbone AG
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*
diff --git a/src/gsad_gmp_request.h b/src/gsad_gmp_request.h
index 730304f..665d669 100644
--- a/src/gsad_gmp_request.h
+++ b/src/gsad_gmp_request.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2019-2021 Greenbone Networks GmbH
+/* Copyright (C) 2019-2021 Greenbone AG
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*
diff --git a/src/gsad_http.c b/src/gsad_http.c
index 24c1493..c372593 100644
--- a/src/gsad_http.c
+++ b/src/gsad_http.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016-2021 Greenbone Networks GmbH
+/* Copyright (C) 2016-2021 Greenbone AG
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*
diff --git a/src/gsad_http.h b/src/gsad_http.h
index 27b44f4..8a4f3d7 100644
--- a/src/gsad_http.h
+++ b/src/gsad_http.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016-2021 Greenbone Networks GmbH
+/* Copyright (C) 2016-2021 Greenbone AG
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*
diff --git a/src/gsad_http_handler.c b/src/gsad_http_handler.c
index 59b1970..98f49ea 100644
--- a/src/gsad_http_handler.c
+++ b/src/gsad_http_handler.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016-2021 Greenbone Networks GmbH
+/* Copyright (C) 2016-2021 Greenbone AG
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*
diff --git a/src/gsad_http_handler.h b/src/gsad_http_handler.h
index 3f22d96..2699fa4 100644
--- a/src/gsad_http_handler.h
+++ b/src/gsad_http_handler.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016-2021 Greenbone Networks GmbH
+/* Copyright (C) 2016-2021 Greenbone AG
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*
diff --git a/src/gsad_i18n.c b/src/gsad_i18n.c
index 4b21cc5..7e507a1 100644
--- a/src/gsad_i18n.c
+++ b/src/gsad_i18n.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015-2021 Greenbone Networks GmbH
+/* Copyright (C) 2015-2021 Greenbone AG
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*
diff --git a/src/gsad_i18n.h b/src/gsad_i18n.h
index e98a0c6..0e17565 100644
--- a/src/gsad_i18n.h
+++ b/src/gsad_i18n.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015-2021 Greenbone Networks GmbH
+/* Copyright (C) 2015-2021 Greenbone AG
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*
diff --git a/src/gsad_log_conf.cmake_in b/src/gsad_log_conf.cmake_in
index f0ce11f..3e1f5c5 100644
--- a/src/gsad_log_conf.cmake_in
+++ b/src/gsad_log_conf.cmake_in
@@ -31,6 +31,13 @@ prepend_time_format=%Y-%m-%d %Hh%M.%S %Z
file=${GVM_LOG_DIR}/gsad.log
level=127
+[gsad vali]
+prepend=%t %s %p
+separator=:
+prepend_time_format=%Y-%m-%d %Hh%M.%S %Z
+file=${GVM_LOG_DIR}/gsad.log
+level=127
+
[*]
prepend=%t %s %p
separator=:
diff --git a/src/gsad_params.h b/src/gsad_params.h
index 84991de..3e7fbd8 100644
--- a/src/gsad_params.h
+++ b/src/gsad_params.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016-2021 Greenbone Networks GmbH
+/* Copyright (C) 2016-2021 Greenbone AG
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*
diff --git a/src/gsad_session.c b/src/gsad_session.c
index 409470b..22a3fe5 100644
--- a/src/gsad_session.c
+++ b/src/gsad_session.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018-2021 Greenbone Networks GmbH
+/* Copyright (C) 2018-2021 Greenbone AG
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*
diff --git a/src/gsad_session.h b/src/gsad_session.h
index c774832..b83cdd5 100644
--- a/src/gsad_session.h
+++ b/src/gsad_session.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018-2021 Greenbone Networks GmbH
+/* Copyright (C) 2018-2021 Greenbone AG
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*
diff --git a/src/gsad_settings.c b/src/gsad_settings.c
index c0e9d65..fdc01b2 100644
--- a/src/gsad_settings.c
+++ b/src/gsad_settings.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016-2021 Greenbone Networks GmbH
+/* Copyright (C) 2016-2021 Greenbone AG
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*
diff --git a/src/gsad_settings.h b/src/gsad_settings.h
index 5cd0059..7f3d35c 100644
--- a/src/gsad_settings.h
+++ b/src/gsad_settings.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016-2021 Greenbone Networks GmbH
+/* Copyright (C) 2016-2021 Greenbone AG
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*
diff --git a/src/gsad_user.c b/src/gsad_user.c
index d68dfde..a938a81 100644
--- a/src/gsad_user.c
+++ b/src/gsad_user.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016-2021 Greenbone Networks GmbH
+/* Copyright (C) 2016-2021 Greenbone AG
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*
@@ -292,6 +292,8 @@ user_logout (user_t *user)
if (fuser)
{
+ if (fuser->username && fuser->password)
+ logout_gmp (fuser->username, fuser->password);
session_remove_user (fuser->token);
user_free (fuser);
return 0;
@@ -327,6 +329,8 @@ user_add (const gchar *username, const gchar *password, const gchar *timezone,
if (user && user_session_expired (user))
{
+ if (user->username && user->password)
+ logout_gmp (user->username, user->password);
session_remove_user (user->token);
user_free (user);
}
@@ -371,6 +375,8 @@ user_find (const gchar *cookie, const gchar *token, const char *address,
{
if (user_session_expired (user))
{
+ if (user->username && user->password)
+ logout_gmp (user->username, user->password);
session_remove_user (user->token);
user_free (user);
return USER_EXPIRED_TOKEN;
diff --git a/src/gsad_user.h b/src/gsad_user.h
index 742b0b9..9dcf45e 100644
--- a/src/gsad_user.h
+++ b/src/gsad_user.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016-2021 Greenbone Networks GmbH
+/* Copyright (C) 2016-2021 Greenbone AG
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*
diff --git a/src/gsad_validator.c b/src/gsad_validator.c
index a41283f..df8f8fc 100644
--- a/src/gsad_validator.c
+++ b/src/gsad_validator.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2021 Greenbone Networks GmbH
+/* Copyright (C) 2009-2021 Greenbone AG
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*
@@ -594,6 +594,7 @@ init_validator ()
gvm_validator_alias (validator, "method", "condition");
gvm_validator_alias (validator, "modify_password", "number");
gvm_validator_alias (validator, "ldaphost", "hostport");
+ gvm_validator_alias (validator, "ldaps_only", "boolean");
gvm_validator_alias (validator, "lean", "boolean");
gvm_validator_alias (validator, "level_high", "boolean");
gvm_validator_alias (validator, "level_medium", "boolean");
diff --git a/src/gsad_validator.h b/src/gsad_validator.h
index 9f1f5b1..e2e8569 100644
--- a/src/gsad_validator.h
+++ b/src/gsad_validator.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2022 Greenbone Networks GmbH
+/* Copyright (C) 2009-2022 Greenbone AG
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*
diff --git a/src/gsad_validator_test.c b/src/gsad_validator_test.c
index 1626540..41a4fba 100644
--- a/src/gsad_validator_test.c
+++ b/src/gsad_validator_test.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2022 Greenbone Networks GmbH
+/* Copyright (C) 2022 Greenbone AG
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*
diff --git a/src/utils.c b/src/utils.c
index 6c08a5c..46fa25f 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018-2021 Greenbone Networks GmbH
+/* Copyright (C) 2018-2021 Greenbone AG
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*
diff --git a/src/utils.h b/src/utils.h
index 2d1655f..5a28499 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018-2021 Greenbone Networks GmbH
+/* Copyright (C) 2018-2021 Greenbone AG
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*
diff --git a/src/validator.c b/src/validator.c
index 2a74944..6ac16e5 100644
--- a/src/validator.c
+++ b/src/validator.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2021 Greenbone Networks GmbH
+/* Copyright (C) 2009-2021 Greenbone AG
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*
diff --git a/src/validator.h b/src/validator.h
index 6dc136e..df957ed 100644
--- a/src/validator.h
+++ b/src/validator.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2021 Greenbone Networks GmbH
+/* Copyright (C) 2009-2021 Greenbone AG
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*
More details
Historical runs
- failed: A required package was not found
- nothing-to-do: Last upstream version 22.4.0 already imported.
- quilt-patch-out-of-date: Quilt patch adapt-gsad-service.patch no longer applies
- quilt-refresh-error: An error occurred refreshing quilt patch adapt-gsad-service.patch: Applying patch debian/patches/adapt-gsad-service.patch patching file config/gsad.service.in Hunk #1 FAILED at 6. 1 out of 1 hunk FAILED -- rejects in file config/gsad.service.in Patch debian/patches/adapt-gsad-service.patch does not apply (enforce with -f)