Skip to content

Commit

Permalink
Merge branch 'main' into get-nvts-lean
Browse files Browse the repository at this point in the history
  • Loading branch information
mattmundell authored Oct 4, 2023
2 parents ac695f8 + 172e024 commit cb18c69
Show file tree
Hide file tree
Showing 9 changed files with 38 additions and 25 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out gvmd
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Check Source Format
run: |
clang-format -i -style=file src/gmp_{base,delete,get,tickets}.h \
Expand All @@ -25,7 +25,7 @@ jobs:
container: greenbone/gvmd-build:stable
steps:
- name: Check out gvmd
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install clang tools
run: |
apt update
Expand All @@ -49,7 +49,7 @@ jobs:
container: greenbone/gvmd-build:stable
steps:
- name: Check out gvmd
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Build gvmd
run: |
cmake -B build -DCMAKE_BUILD_TYPE=Debug -DENABLE_COVERAGE=1
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build-container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- uses: greenbone/actions/is-latest-tag@v3
id: latest
- name: Setup container meta information
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: ${{ github.repository }}-build
labels: |
Expand Down Expand Up @@ -63,17 +63,17 @@ jobs:
fi
- name: Login to DockerHub
if: github.event_name != 'pull_request'
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- run: echo "Build and push ${{ steps.meta.outputs.tags }}"
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Build and push
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
push: ${{ github.event_name != 'pull_request' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
container: greenbone/gvmd-build:stable
steps:
- name: Check out gvmd
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Generate GMP documentation (HTML)
run: |
mkdir build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis-c.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- uses: greenbone/actions/is-latest-tag@v3
id: latest
- name: Setup container meta information
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: ${{ github.repository }}
labels: |
Expand Down Expand Up @@ -55,16 +55,16 @@ jobs:
fi
- name: Login to Docker Registry
if: github.event_name != 'pull_request'
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Build and push Container image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
push: ${{ github.event_name != 'pull_request' && (github.ref_type == 'tag' || github.ref_name == 'main') }}
Expand Down
7 changes: 5 additions & 2 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -508,9 +508,12 @@ Look for the current key and remember its keyid. Then:
gpg --homedir /var/lib/gvm/gvmd/gnupg --edit-key KEYID
At the prompt enter `disable` followed by `save` and `quit`.
Then create a new key and re-encrypt all passwords:
Then start gvmd to create a new key:
gvmd
and finally re-encrypt all passwords:
gvmd --create-credentials-encryption-key
gvmd --encrypt-all-credentials
No encryption: If for backward compatibility reasons encrypted credentials
Expand Down
6 changes: 5 additions & 1 deletion src/manage_sql.c
Original file line number Diff line number Diff line change
Expand Up @@ -17464,6 +17464,10 @@ authenticate (credentials_t* credentials)
g_free (quoted_name);
g_free (quoted_method);

if (credentials->uuid == NULL)
/* Can happen if user is deleted while logged in to GSA. */
return 1;

if (credentials_setup (credentials))
{
free (credentials->uuid);
Expand Down Expand Up @@ -20112,7 +20116,7 @@ init_host_prognosis_iterator (iterator_t* iterator, report_host_t report_host)
" FROM scap.cves, scap.cpes, scap.affected_products,"
" report_host_details"
" WHERE report_host_details.report_host = %llu"
" AND cpes.name = report_host_details.value"
" AND LOWER(cpes.name) = LOWER(report_host_details.value)"
" AND report_host_details.name = 'App'"
" AND cpes.id=affected_products.cpe"
" AND cves.id=affected_products.cve"
Expand Down
2 changes: 1 addition & 1 deletion src/schema_formats/HTML/HTML.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<xsl:text>&gt;</xsl:text>
<xsl:call-template name="newline"/>
<xsl:choose>
<xsl:when test="name() = 'help_response' or name() = 'p'">
<xsl:when test="name() = 'help_response' or name() = 'p' or name() = 'icalendar'">
<!-- Special case certain responses to preserve whitespace. -->
<xsl:variable name="string" select="func:string-trim-nl(text())"/>
<xsl:if test="string-length($string) &gt; 0">
Expand Down
14 changes: 10 additions & 4 deletions src/schema_formats/XML/GMP.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -4994,11 +4994,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<summary>Create a schedule</summary>
<request>
<create_schedule>
<name>Every day</name>
<timezone>UTC</timezone>
<name>On the third Wednesday of every month</name>
<timezone>America/New_York</timezone>
<icalendar>
<truncated>...</truncated>
DTSTART;TZID=/UTC:20200603T162600
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//XXX//NONSGML//EN
BEGIN:VEVENT
DTSTART;TZID="America/New_York":20221214T000100
RRULE:FREQ=MONTHLY;BYDAY=3WE;
END:VEVENT
END:VCALENDAR
</icalendar>
</create_schedule>
</request>
Expand Down

0 comments on commit cb18c69

Please sign in to comment.