Skip to content

Commit e5f1e46

Browse files
doxthreelennartdohmann
doxthree
authored and
lennartdohmann
committed
Merge branch 'main' into cs/http_api
2 parents 8b44766 + 3983899 commit e5f1e46

File tree

181 files changed

+7620
-4384
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

181 files changed

+7620
-4384
lines changed

‎.github/workflows/ci-cpp.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ on:
2828
env:
2929
CLIENT_ID: ${{ secrets.CLIENT_ID }}
3030
CLIENT_SECRET: ${{secrets.CLIENT_SECRET}}
31-
VAAS_URL: "https://upload.production.vaas.gdatasecurity.de"
31+
VAAS_URL: "https://gateway.production.vaas.gdatasecurity.de"
3232
TOKEN_URL: "https://account.gdata.de/realms/vaas-production/protocol/openid-connect/token"
3333
VAAS_CLIENT_ID: ${{ secrets.VAAS_CLIENT_ID }}
3434
VAAS_USER_NAME: ${{ secrets.VAAS_USER_NAME }}
@@ -64,7 +64,7 @@ jobs:
6464
run: |
6565
echo "CLIENT_ID=${{ secrets.DEVELOP_CLIENT_ID }}" >> $GITHUB_ENV
6666
echo "CLIENT_SECRET=${{ secrets.DEVELOP_CLIENT_SECRET }}" >> $GITHUB_ENV
67-
echo "VAAS_URL=https://upload.develop.vaas.gdatasecurity.de" >> $GITHUB_ENV
67+
echo "VAAS_URL=https://gateway.develop.vaas.gdatasecurity.de" >> $GITHUB_ENV
6868
echo "TOKEN_URL=https://account-staging.gdata.de/realms/vaas-develop/protocol/openid-connect/token" >> $GITHUB_ENV
6969
echo "VAAS_CLIENT_ID=${{ secrets.DEVELOP_VAAS_CLIENT_ID }}" >> $GITHUB_ENV
7070
echo "VAAS_USER_NAME=${{ secrets.DEVELOP_VAAS_USER_NAME }}" >> $GITHUB_ENV

‎.github/workflows/ci-git-scan.yaml‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎.github/workflows/ci-golang.yaml‎

Lines changed: 75 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ on:
2626
default: "production"
2727

2828
env:
29+
LATEST_PATH: v3/
2930
CLIENT_ID: ${{ secrets.CLIENT_ID }}
3031
CLIENT_SECRET: ${{secrets.CLIENT_SECRET}}
3132
VAAS_URL: "wss://gateway.production.vaas.gdatasecurity.de"
@@ -62,28 +63,47 @@ jobs:
6263
image: golang:latest
6364
strategy:
6465
matrix:
65-
version-directory: ["./", "v2/"]
66+
version-directory: ["./", "v2/", "v3/"]
6667
steps:
6768
- uses: actions/checkout@v4
6869

70+
- name: set legacy vaas gateway for production
71+
run: |
72+
if [ "${{ matrix.version-directory }}" = "./" -o "${{ matrix.version-directory }}" = "v2/" ]; then
73+
echo "VAAS_URL=wss://gateway.production.vaas.gdatasecurity.de" >> $GITHUB_ENV
74+
else
75+
echo "VAAS_URL=https://gateway.production.vaas.gdatasecurity.de" >> $GITHUB_ENV
76+
fi
77+
78+
6979
- name: set staging environment
7080
if: (inputs.environment == 'staging' || (startsWith(github.ref, 'refs/tags') && endsWith(github.ref, '-beta')))
7181
run: |
82+
echo "Beta version: Testing against staging"
7283
echo "CLIENT_ID=${{ secrets.STAGING_CLIENT_ID }}" >> $GITHUB_ENV
7384
echo "CLIENT_SECRET=${{ secrets.STAGING_CLIENT_SECRET }}" >> $GITHUB_ENV
74-
echo "VAAS_URL=wss://gateway.staging.vaas.gdatasecurity.de" >> $GITHUB_ENV
7585
echo "TOKEN_URL=https://account-staging.gdata.de/realms/vaas-staging/protocol/openid-connect/token" >> $GITHUB_ENV
86+
if [ "${{ matrix.version-directory }}" = "./" -o "${{ matrix.version-directory }}" = "v2/" ]; then
87+
echo "VAAS_URL=wss://gateway.staging.vaas.gdatasecurity.de" >> $GITHUB_ENV
88+
else
89+
echo "VAAS_URL=https://gateway.staging.vaas.gdatasecurity.de" >> $GITHUB_ENV
90+
fi
7691
echo "VAAS_CLIENT_ID=${{ secrets.STAGING_VAAS_CLIENT_ID }}" >> $GITHUB_ENV
7792
echo "VAAS_USER_NAME=${{ secrets.STAGING_VAAS_USER_NAME }}" >> $GITHUB_ENV
7893
echo "VAAS_PASSWORD=${{ secrets.STAGING_VAAS_PASSWORD }}" >> $GITHUB_ENV
7994
8095
- name: set develop environment
8196
if: (inputs.environment == 'develop' || (startsWith(github.ref, 'refs/tags') && endsWith(github.ref, '-alpha')))
8297
run: |
98+
echo "Alpha version: Testing against develop"
8399
echo "CLIENT_ID=${{ secrets.DEVELOP_CLIENT_ID }}" >> $GITHUB_ENV
84100
echo "CLIENT_SECRET=${{ secrets.DEVELOP_CLIENT_SECRET }}" >> $GITHUB_ENV
85-
echo "VAAS_URL=wss://gateway.develop.vaas.gdatasecurity.de" >> $GITHUB_ENV
86101
echo "TOKEN_URL=https://account-staging.gdata.de/realms/vaas-develop/protocol/openid-connect/token" >> $GITHUB_ENV
102+
if [ "${{ matrix.version-directory }}" = "./" -o "${{ matrix.version-directory }}" = "v2/" ]; then
103+
echo "VAAS_URL=wss://gateway.develop.vaas.gdatasecurity.de" >> $GITHUB_ENV
104+
else
105+
echo "VAAS_URL=https://gateway.develop.vaas.gdatasecurity.de" >> $GITHUB_ENV
106+
fi
87107
echo "VAAS_CLIENT_ID=${{ secrets.DEVELOP_VAAS_CLIENT_ID }}" >> $GITHUB_ENV
88108
echo "VAAS_USER_NAME=${{ secrets.DEVELOP_VAAS_USER_NAME }}" >> $GITHUB_ENV
89109
echo "VAAS_PASSWORD=${{ secrets.DEVELOP_VAAS_PASSWORD }}" >> $GITHUB_ENV
@@ -141,7 +161,7 @@ jobs:
141161
image: golang:latest
142162
strategy:
143163
matrix:
144-
version-directory: [".", "v2"]
164+
version-directory: [".", "v2", "v3"]
145165
steps:
146166
- uses: actions/checkout@v4
147167
- name: Install govulncheck
@@ -174,9 +194,9 @@ jobs:
174194
- name: publish module
175195
env:
176196
MAJOR_VERSION: ${{ needs.extract-major-version.outputs.major_version }}
177-
if: startsWith(github.ref, 'refs/tags')
197+
if: startsWith(github.ref, 'refs/tags/golang/vaas/v3<')
178198
run: |
179-
if [ "$MAJOR_VERSION" == "v1" ]; then
199+
if [ "$MAJOR_VERSION" = "v1" ]; then
180200
GOPROXY=proxy.golang.org go list -m github.com/GDATASoftwareAG/vaas/golang/vaas@${GITHUB_REF#refs/tags/golang/vaas/}
181201
else
182202
GOPROXY=proxy.golang.org go list -m github.com/GDATASoftwareAG/vaas/golang/vaas/${MAJOR_VERSION}@${GITHUB_REF#refs/tags/golang/vaas/}
@@ -190,3 +210,52 @@ jobs:
190210
title: "`Failed workflow on for VaaS-SDK vaas-golang-ci`"
191211
job: ${{ toJson(job) }}
192212
steps: ${{ toJson(steps) }}
213+
214+
deploy-git-scan:
215+
if: startsWith(github.ref, 'refs/tags')
216+
needs:
217+
- extract-major-version
218+
- virus-scan
219+
- build-golang
220+
- codeql
221+
- vulncheck
222+
permissions:
223+
contents: read
224+
packages: write
225+
runs-on: ubuntu-latest
226+
steps:
227+
- uses: actions/checkout@v4
228+
229+
- name: Set up Docker Buildx
230+
uses: docker/setup-buildx-action@v3
231+
232+
- name: Docker meta
233+
env:
234+
MAJOR_VERSION: ${{ needs.extract-major-version.outputs.major_version }}
235+
uses: docker/metadata-action@v5
236+
id: meta
237+
with:
238+
images: |
239+
ghcr.io/gdatasoftwareag/vaas/git-scan
240+
tags: |
241+
type=semver,pattern={{version}},value=${{ env.MAJOR_VERSION }}
242+
type=semver,pattern={{major}}.{{minor}},value=${{ env.MAJOR_VERSION }}
243+
type=semver,pattern={{major}},value=${{ env.MAJOR_VERSION }}
244+
flavor: |
245+
latest=auto
246+
247+
- name: login to ghcr.io/gdatasoftwareag
248+
uses: docker/login-action@v3
249+
with:
250+
registry: ghcr.io
251+
username: ${{ secrets.GHCR_IO_GDATASOFTWAREAG_USERNAME }}
252+
password: ${{ secrets.GHCR_IO_GDATASOFTWAREAG_PASSWORD }}
253+
254+
- name: Build and push
255+
uses: docker/build-push-action@v6
256+
with:
257+
context: "golang/vaas/${{ env.LATEST_PATH }}"
258+
file: "golang/vaas/${{ env.LATEST_PATH }}git-scan.Dockerfile"
259+
push: true
260+
tags: ${{ steps.meta.outputs.tags }}
261+
labels: ${{ steps.meta.outputs.labels }}

‎.github/workflows/ci-java.yaml‎

Lines changed: 33 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ on:
2828
env:
2929
CLIENT_ID: ${{ secrets.CLIENT_ID }}
3030
CLIENT_SECRET: ${{secrets.CLIENT_SECRET}}
31-
VAAS_URL: "wss://gateway.production.vaas.gdatasecurity.de"
31+
VAAS_URL: "https://gateway.production.vaas.gdatasecurity.de"
3232
TOKEN_URL: "https://account.gdata.de/realms/vaas-production/protocol/openid-connect/token"
3333
VAAS_CLIENT_ID: ${{ secrets.VAAS_CLIENT_ID }}
3434
VAAS_USER_NAME: ${{ secrets.VAAS_USER_NAME }}
@@ -54,7 +54,7 @@ jobs:
5454
run: |
5555
echo "CLIENT_ID=${{ secrets.STAGING_CLIENT_ID }}" >> $GITHUB_ENV
5656
echo "CLIENT_SECRET=${{ secrets.STAGING_CLIENT_SECRET }}" >> $GITHUB_ENV
57-
echo "VAAS_URL=wss://gateway.staging.vaas.gdatasecurity.de" >> $GITHUB_ENV
57+
echo "VAAS_URL=https://gateway.staging.vaas.gdatasecurity.de" >> $GITHUB_ENV
5858
echo "TOKEN_URL=https://account-staging.gdata.de/realms/vaas-staging/protocol/openid-connect/token" >> $GITHUB_ENV
5959
echo "VAAS_CLIENT_ID=${{ secrets.STAGING_VAAS_CLIENT_ID }}" >> $GITHUB_ENV
6060
echo "VAAS_USER_NAME=${{ secrets.STAGING_VAAS_USER_NAME }}" >> $GITHUB_ENV
@@ -65,7 +65,7 @@ jobs:
6565
run: |
6666
echo "CLIENT_ID=${{ secrets.DEVELOP_CLIENT_ID }}" >> $GITHUB_ENV
6767
echo "CLIENT_SECRET=${{ secrets.DEVELOP_CLIENT_SECRET }}" >> $GITHUB_ENV
68-
echo "VAAS_URL=wss://gateway.develop.vaas.gdatasecurity.de" >> $GITHUB_ENV
68+
echo "VAAS_URL=https://gateway.develop.vaas.gdatasecurity.de" >> $GITHUB_ENV
6969
echo "TOKEN_URL=https://account-staging.gdata.de/realms/vaas-develop/protocol/openid-connect/token" >> $GITHUB_ENV
7070
echo "VAAS_CLIENT_ID=${{ secrets.DEVELOP_VAAS_CLIENT_ID }}" >> $GITHUB_ENV
7171
echo "VAAS_USER_NAME=${{ secrets.DEVELOP_VAAS_USER_NAME }}" >> $GITHUB_ENV
@@ -89,27 +89,52 @@ jobs:
8989
gradle-version: "8.6"
9090
build-root-directory: java
9191

92-
- name: run examples for file
92+
- name: run forSha256 example
93+
uses: gradle/gradle-build-action@v3
94+
with:
95+
arguments: sha256Scan
96+
gradle-version: "8.6"
97+
build-root-directory: java/examples/VaasExample
98+
99+
- name: run forFile example
93100
env:
94-
SCAN_PATH: "src/main/java/de/gdata/vaasexample/Main.java"
101+
SCAN_PATH: "build.gradle"
95102
uses: gradle/gradle-build-action@v3
96103
with:
97104
arguments: fileScan
98105
gradle-version: "8.6"
99106
build-root-directory: java/examples/VaasExample
100107

101-
- name: run examples for url
108+
- name: run forStream example
109+
env:
110+
SCAN_PATH: "build.gradle"
102111
uses: gradle/gradle-build-action@v3
103112
with:
104-
arguments: urlScan
113+
arguments: streamScan
105114
gradle-version: "8.6"
106115
build-root-directory: java/examples/VaasExample
107116

108-
- name: run authentication examples
117+
- name: run forUrl example
118+
uses: gradle/gradle-build-action@v3
119+
with:
120+
arguments: urlScan
121+
gradle-version: "8.6"
122+
build-root-directory: java/examples/VaasExample
123+
124+
- name: run authentication example
109125
uses: gradle/gradle-build-action@v3
110126
with:
111127
arguments: authentication
112128
gradle-version: "8.6"
129+
build-root-directory: java/examples/VaasExample
130+
131+
- name: run config example
132+
env:
133+
SCAN_PATH: "build.gradle"
134+
uses: gradle/gradle-build-action@v3
135+
with:
136+
arguments: config
137+
gradle-version: "8.6"
113138
build-root-directory: java/examples/VaasExample
114139

115140
- name: extract version
@@ -140,7 +165,6 @@ jobs:
140165
MAVEN_CENTRAL_BEARER_TOKEN: ${{ secrets.MAVEN_CENTRAL_BEARER_TOKEN }}
141166
working-directory: java/build/repos/releases
142167
run: |
143-
rm -rf de/gdata/vaas/*.xml*
144168
zip -r package.zip .
145169
curl --fail \
146170
--header "Authorization: Bearer ${MAVEN_CENTRAL_BEARER_TOKEN}" \

‎.github/workflows/ci-php.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ on:
2929
env:
3030
CLIENT_ID: ${{ secrets.CLIENT_ID }}
3131
CLIENT_SECRET: ${{secrets.CLIENT_SECRET}}
32-
VAAS_URL: "wss://gateway.production.vaas.gdatasecurity.de"
32+
VAAS_URL: "https://gateway.production.vaas.gdatasecurity.de"
3333
TOKEN_URL: "https://account.gdata.de/realms/vaas-production/protocol/openid-connect/token"
3434
VAAS_CLIENT_ID: ${{ secrets.VAAS_CLIENT_ID }}
3535
VAAS_USER_NAME: ${{ secrets.VAAS_USER_NAME }}
@@ -41,7 +41,7 @@ jobs:
4141
runs-on: ubuntu-22.04
4242
strategy:
4343
matrix:
44-
version: ["8.1", "8.2", "8.3"]
44+
version: ["8.1", "8.2", "8.3", "8.4"]
4545
steps:
4646
- name: checkout
4747
uses: actions/checkout@v4
@@ -57,7 +57,7 @@ jobs:
5757
run: |
5858
echo "CLIENT_ID=${{ secrets.STAGING_CLIENT_ID }}" >> $GITHUB_ENV
5959
echo "CLIENT_SECRET=${{ secrets.STAGING_CLIENT_SECRET }}" >> $GITHUB_ENV
60-
echo "VAAS_URL=wss://gateway.staging.vaas.gdatasecurity.de" >> $GITHUB_ENV
60+
echo "VAAS_URL=https://gateway.staging.vaas.gdatasecurity.de" >> $GITHUB_ENV
6161
echo "TOKEN_URL=https://account-staging.gdata.de/realms/vaas-staging/protocol/openid-connect/token" >> $GITHUB_ENV
6262
echo "VAAS_CLIENT_ID=${{ secrets.STAGING_VAAS_CLIENT_ID }}" >> $GITHUB_ENV
6363
echo "VAAS_USER_NAME=${{ secrets.STAGING_VAAS_USER_NAME }}" >> $GITHUB_ENV
@@ -68,7 +68,7 @@ jobs:
6868
run: |
6969
echo "CLIENT_ID=${{ secrets.DEVELOP_CLIENT_ID }}" >> $GITHUB_ENV
7070
echo "CLIENT_SECRET=${{ secrets.DEVELOP_CLIENT_SECRET }}" >> $GITHUB_ENV
71-
echo "VAAS_URL=wss://gateway.develop.vaas.gdatasecurity.de" >> $GITHUB_ENV
71+
echo "VAAS_URL=https://gateway.develop.vaas.gdatasecurity.de" >> $GITHUB_ENV
7272
echo "TOKEN_URL=https://account-staging.gdata.de/realms/vaas-develop/protocol/openid-connect/token" >> $GITHUB_ENV
7373
echo "VAAS_CLIENT_ID=${{ secrets.DEVELOP_VAAS_CLIENT_ID }}" >> $GITHUB_ENV
7474
echo "VAAS_USER_NAME=${{ secrets.DEVELOP_VAAS_USER_NAME }}" >> $GITHUB_ENV
@@ -82,12 +82,12 @@ jobs:
8282
- name: install php dependencies
8383
uses: php-actions/composer@v6
8484
with:
85-
working_dir: php/tests/vaas
85+
working_dir: php/tests/VaasTesting
8686
php_version: ${{ matrix.version }}
8787

8888
- name: run tests
89-
run: ./vendor/bin/phpunit --colors --testdox
90-
working-directory: php/tests/vaas
89+
run: ./vendor/bin/phpunit --colors --testdox --exclude-group exclude
90+
working-directory: php/tests/VaasTesting
9191

9292
- name: install example requirements
9393
run: composer install

‎Readme.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ The following table shows the functionality supported by each SDK:
6969

7070
|Functionality|Rust|Java|PHP|TypeScript|.NET|Python|Ruby|Golang|C++|
7171
|---|---|---|---|---|---|---|---|---|---|
72+
|Use HTTP API|&#10060;|&#9989;|&#10060;|&#10060;|&#10060;|&#10060;|&#10060;|&#9989;|&#10060;|
7273
|Check SHA256|&#9989;|&#9989;|&#9989;|&#9989;|&#9989;|&#9989;|&#9989;|&#9989;|&#9989;|
73-
|Check SHA256 list|&#9989;|&#9989;|&#10060;|&#9989;|&#9989;|&#10060;|&#10060;|&#9989;|&#10060;|
74+
|Check File|&#9989;|&#9989;|&#9989;|&#9989;|&#9989;|&#9989;|&#9989;|&#9989;|&#9989;|
7475
|Check URL|&#9989;|&#9989;|&#9989;|&#9989;|&#9989;|&#9989;|&#9989;|&#9989;|&#10060;|
75-
|Check file|&#9989;|&#9989;|&#9989;|&#9989;|&#9989;|&#9989;|&#9989;|&#9989;|&#9989;|
76-
|Check file list|&#9989;|&#9989;|&#10060;|&#9989;|&#9989;|&#10060;|&#10060;|&#9989;|&#10060;|
77-
|Custom Guids for tracability on user side|&#10060;|&#10060;|&#9989;|&#10060;|&#10060;|&#9989;|&#10060;|&#10060;|&#10060;|
76+
|Check Stream|&#9989;|&#9989;|&#9989;|&#9989;|&#9989;|&#9989;|&#10060;|&#9989;|&#9989;|
77+
||
7878

7979

8080
## Integration Ideas for Malware Detection trough VaaS

‎dotnet/Vaas/.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"csharpier": {
6-
"version": "0.30.2",
6+
"version": "0.30.6",
77
"commands": [
88
"dotnet-csharpier"
99
]

0 commit comments

Comments
 (0)