Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Features/docusaurus #1

Merged
merged 132 commits into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
132 commits
Select commit Hold shift + click to select a range
8cb132b
feat: Merge PR #252
borisrizov-zf Feb 9, 2024
99f1da8
chore(release): 0.5.0-develop.1 [skip ci]
borisrizov-zf Feb 9, 2024
effb480
feat: add domain objects needed by sts infrastructure
borisrizov-zf Feb 4, 2024
103e7f2
feat: add dto objects for sts infrastructure
borisrizov-zf Feb 4, 2024
56a48eb
feat: add missing relationships to entities
borisrizov-zf Feb 4, 2024
018d9c0
feat: add sts properties
borisrizov-zf Feb 4, 2024
b4bb9b7
feat: add exceptions for sts infrastructure
borisrizov-zf Feb 4, 2024
e982919
feat: extend 'miw.security' properties
borisrizov-zf Feb 4, 2024
4227f3e
feat: implement token endpoint
borisrizov-zf Feb 4, 2024
d6c30bf
feat: add token endpoint happy-path test
borisrizov-zf Feb 4, 2024
5330f64
fix: add missing JSON properties
borisrizov-zf Feb 5, 2024
9b7222d
chore(test): remove commented code
borisrizov-zf Feb 7, 2024
873f9d2
chore: rename the /token controller method
borisrizov-zf Feb 7, 2024
f45b291
chore: remove fields from toString method in dto
borisrizov-zf Feb 7, 2024
762349c
chore: use UriComponentsBuilder for idp url
borisrizov-zf Feb 8, 2024
9a12905
chore: replace generic assert with dedicated exception
borisrizov-zf Feb 8, 2024
72b5fd2
chore: fix debug message for idp request
borisrizov-zf Feb 8, 2024
218ec6c
chore: move comment above relevant code
borisrizov-zf Feb 8, 2024
da37374
chore: add api doc for InvalidIdpTokenResponse
borisrizov-zf Feb 8, 2024
baace00
chore: refactor to using did in token controller
borisrizov-zf Feb 9, 2024
c53f83d
chore: fix typo in exception message
borisrizov-zf Feb 9, 2024
1f84f22
chore: use paremeterized type reference in test
borisrizov-zf Feb 9, 2024
9ef08dd
chore: fix warnings in token test
borisrizov-zf Feb 9, 2024
6000199
chore: update exception message in api doc
borisrizov-zf Feb 9, 2024
9aa5862
chore: move exception class to correct package
borisrizov-zf Feb 19, 2024
7aceb09
chore: add missing 'exception' suffix
borisrizov-zf Feb 19, 2024
754ac68
chore: update token endpoint
borisrizov-zf Feb 19, 2024
accc0d2
feat: use a spring validator for SecureTokenRequest
borisrizov-zf Feb 20, 2024
053bc84
Merge pull request #249 from borisrizov-zf/feature/token-service-and-…
borisrizov-zf Feb 22, 2024
7873e56
chore(release): 0.5.0-develop.2 [skip ci]
borisrizov-zf Feb 22, 2024
061faa7
feat: create initial class
aleksandra-bel Feb 7, 2024
fc5db81
feat: create initial classes with validation
aleksandra-bel Feb 7, 2024
89c7565
chore: add unit tests
aleksandra-bel Feb 7, 2024
46c6321
chore: refactor if clauses
aleksandra-bel Feb 7, 2024
ce75056
feat: adding draft for integration test, refactoring
aleksandra-bel Feb 9, 2024
5ae223d
feat: add JWT verification and extend tests
andreibogus Feb 12, 2024
03d99b9
chore: remove unnecessary class
aleksandra-bel Feb 15, 2024
3daaeeb
chore: remove unnecessary requestMatcher
andreibogus Feb 22, 2024
d83ce91
feat: add JWT verification and extend tests
andreibogus Feb 12, 2024
5b945fc
chore: remove unnecessary class
andreibogus Feb 22, 2024
d8084ee
fix: fix integration test
aleksandra-bel Feb 22, 2024
a918fd2
chore(ci): remove dast report step
borisrizov-zf Feb 23, 2024
fe858dd
chore(ci): add minimum retention for dast report
borisrizov-zf Feb 23, 2024
1c1f1fb
fix: DAST scan PR #256
borisrizov-zf Feb 23, 2024
008dde6
chore(release): 0.5.0-develop.3 [skip ci]
borisrizov-zf Feb 23, 2024
4af7318
chore(ci): add gradle wrapper validation
borisrizov-zf Feb 23, 2024
f9acf55
fix: Add missing gradle validation PR #257
borisrizov-zf Feb 23, 2024
524aad5
chore(release): 0.5.0-develop.4 [skip ci]
borisrizov-zf Feb 23, 2024
e9569a7
chore: reformat and fix exception handling
aleksandra-bel Feb 26, 2024
a0d9bdf
feat: Merge PR #255
borisrizov-zf Feb 27, 2024
0232cd9
chore(release): 0.5.0-develop.5 [skip ci]
borisrizov-zf Feb 27, 2024
4feebd4
feat: add service method, controller, config for scope matching
aleksandra-bel Feb 21, 2024
579a5ec
feat: improve filter, add exception handling
aleksandra-bel Feb 22, 2024
9dc628b
feat: add api docs, option asJwt
aleksandra-bel Feb 26, 2024
478e807
chore: improve api docs
aleksandra-bel Feb 26, 2024
a6c2154
chore: improve api docs
aleksandra-bel Feb 26, 2024
1785080
feat: add ignoring version
aleksandra-bel Feb 27, 2024
ec293b0
chore: move logic to token validation utils
aleksandra-bel Feb 27, 2024
eac5a99
chore: add test for custom web filter
aleksandra-bel Feb 27, 2024
74495d3
chore: clean up configs
aleksandra-bel Feb 27, 2024
2f2e498
chore: fix exception classes
aleksandra-bel Feb 29, 2024
7e51877
chore: improve test coverage
andreibogus Feb 29, 2024
ffce5ba
chore: refactor and fix new tests
andreibogus Feb 29, 2024
4b3c764
chore: refactor test
aleksandra-bel Mar 1, 2024
e500c4b
Merge pull request #259 from aleksandra-bel/feature/scopes-matching
borisrizov-zf Mar 1, 2024
3925170
chore(release): 0.5.0-develop.6 [skip ci]
borisrizov-zf Mar 1, 2024
195c19a
chore: create table, repository and entity for Jti
andreibogus Mar 5, 2024
dae1954
chore: add column name to field in entity
andreibogus Mar 5, 2024
6809578
feat: add logic regarding jti info store and check
aleksandra-bel Mar 5, 2024
4630dca
chore: fix scripts and tests
aleksandra-bel Mar 5, 2024
9987632
chore: refactor
andreibogus Mar 6, 2024
9b277d7
chore: add liquibase comments
andreibogus Mar 6, 2024
b92c924
chore: add nonce on token creation, clean up tests
aleksandra-bel Mar 7, 2024
e047550
fix: fix bug with token re-wrapping
andreibogus Mar 7, 2024
c6edd97
Merge pull request #268 from aleksandra-bel/feature/make_token_one_ti…
borisrizov-zf Mar 7, 2024
381d5c3
chore(release): 0.5.0-develop.7 [skip ci]
borisrizov-zf Mar 7, 2024
eb2e38f
fix: possible caching vulnerability in action
borisrizov-zf Mar 8, 2024
8d13d5e
Merge pull request #269 from borisrizov-zf/fix/update-gradle-build-ac…
borisrizov-zf Mar 8, 2024
052cfe2
chore(release): 0.5.0-develop.8 [skip ci]
borisrizov-zf Mar 8, 2024
e1f6fab
chore: update the setup-helm action
borisrizov-zf Mar 8, 2024
ef0179f
chore: update setup-java action
borisrizov-zf Mar 8, 2024
1d78f2c
chore: update download-artifact action
borisrizov-zf Mar 8, 2024
288f8ac
chore: update upload-artifact action
borisrizov-zf Mar 8, 2024
064f495
chore: update build-and-push action
borisrizov-zf Mar 8, 2024
aaf8e3c
chore: update metadata-action action
borisrizov-zf Mar 8, 2024
6d303eb
chore: update set-output to new format
borisrizov-zf Mar 8, 2024
dfb45b6
chore: update login-action from docker
borisrizov-zf Mar 8, 2024
f6c6901
chore: remove deprecated 'token' value
borisrizov-zf Mar 8, 2024
7058155
Merge pull request #270 from borisrizov-zf/fix/update-outdated-ci-act…
borisrizov-zf Mar 8, 2024
ec60117
feat: add logging of auth failures
borisrizov-zf Mar 8, 2024
6fe9ad3
Merge pull request #271 from borisrizov-zf/feat/83-log-auth-failures
borisrizov-zf Mar 8, 2024
85b8334
chore(release): 0.5.0-develop.9 [skip ci]
borisrizov-zf Mar 8, 2024
1adaf78
docs: add notice about egress for JSON-LD
borisrizov-zf Mar 8, 2024
046a33d
Merge pull request #272 from borisrizov-zf/docs/114-add-notice-about-…
borisrizov-zf Mar 8, 2024
a7d6aa6
feat: upload miw jar to gh release
borisrizov-zf Mar 8, 2024
a8effe0
Merge pull request #273 from borisrizov-zf/feat/upload-jar-artifact-t…
borisrizov-zf Mar 8, 2024
c16a096
chore(release): 0.5.0-develop.10 [skip ci]
borisrizov-zf Mar 8, 2024
9dd6f27
feat: support new algorithm (WIP)
andreibogus Mar 11, 2024
8ddaa84
chore: refactor
aleksandra-bel Mar 11, 2024
b694d19
feat: add extra transaction
andreibogus Mar 12, 2024
cabc658
chore: add postgres test container
aleksandra-bel Mar 12, 2024
dc3d872
chore: improve tests and fix transaction
aleksandra-bel Mar 13, 2024
97437b4
fix: fix kid parameter
andreibogus Mar 13, 2024
b33f8a6
fix: fix ES256K signature
andreibogus Mar 13, 2024
b2a0f75
chore: refactor
aleksandra-bel Mar 14, 2024
9f50bc2
chore: fix sonar issue
aleksandra-bel Mar 14, 2024
541a524
chore: use builder for header
aleksandra-bel Mar 15, 2024
9eb3294
fix: add WalletKey for ES256K algorithm to DidDocument
andreibogus Mar 20, 2024
72b592c
fix: add "y" parameter and remove unused imports
andreibogus Mar 21, 2024
d10a5ed
chore: format code
andreibogus Mar 21, 2024
1b6b70b
Merge pull request #274 from aleksandra-bel/feature/support-ES256K
borisrizov-zf Mar 21, 2024
fe0357f
chore(release): 0.5.0-develop.11 [skip ci]
borisrizov-zf Mar 21, 2024
c911d33
feat: adapt request and wallet service
aleksandra-bel Mar 19, 2024
420ad02
chore: adapt tests
aleksandra-bel Mar 19, 2024
384325d
chore: rename properties
andreibogus Mar 19, 2024
70d9e7e
chore: make didUrl always configurable from request
aleksandra-bel Mar 19, 2024
b6d92df
chore: fix length requirement
aleksandra-bel Mar 20, 2024
ebee250
chore: resolve conflicts
aleksandra-bel Mar 21, 2024
c21f7af
fix: fix did creation in did document
aleksandra-bel Mar 21, 2024
9a10298
chore: change api docs
aleksandra-bel Mar 21, 2024
2536914
chore: add key id
aleksandra-bel Mar 21, 2024
dc0dc40
Merge pull request #275 from aleksandra-bel/feature/adapt-create-wallet
borisrizov-zf Mar 25, 2024
1cbca0d
chore(release): 0.5.0-develop.12 [skip ci]
borisrizov-zf Mar 25, 2024
6a67c92
feat: added body type to /token endpoint
andreibogus Apr 18, 2024
59ccdb2
fix: fix object name
andreibogus Apr 18, 2024
17da4c4
Merge pull request #288 from aleksandra-bel/refactor_body_type_in_tok…
borisrizov-zf Apr 18, 2024
b242a3d
chore(release): 0.5.0-develop.13 [skip ci]
borisrizov-zf Apr 18, 2024
78b7dc3
fix: STS Token API Response
hemantxpatel Apr 29, 2024
8eda499
fix: Test Cases
hemantxpatel Apr 29, 2024
6b1b541
Merge pull request #293 from sap-contributions/fix/sts-token-api
borisrizov-zf May 2, 2024
179b590
chore(release): 0.5.0-develop.14 [skip ci]
borisrizov-zf May 2, 2024
990d915
feat(docu): add docusaurus integration
DominikPinsel May 8, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/app-test-coverage-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,14 @@ jobs:
fetch-depth: 0

- name: Set up Java 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'

- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v2

- name: Test app
run: ./gradlew test

Expand All @@ -48,7 +51,7 @@ jobs:
run: ./gradlew jacocoTestReport

- name: Upload test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: test-results
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/app-test-coverage-repo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:

steps:
- name: Download test results
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: test-results
path: ${{ github.workspace }}/
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/chart-verification.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
fetch-depth: 0

- name: Set up Helm
uses: azure/setup-helm@v3
uses: azure/setup-helm@v4.1.0
with:
version: v3.12.3

Expand Down Expand Up @@ -108,14 +108,14 @@ jobs:
fetch-depth: 0

- name: Set up Helm
uses: azure/setup-helm@v3
uses: azure/setup-helm@v4.1.0
with:
version: v3.12.3

- name: Set up Taskfile
uses: arduino/setup-task@v1

- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
Expand Down Expand Up @@ -151,7 +151,7 @@ jobs:
version: v0.20.0

- name: Build image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
push: true
Expand Down
15 changes: 5 additions & 10 deletions .github/workflows/dast-scan.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ jobs:
fetch-depth: 0

- name: Set up Helm
uses: azure/setup-helm@v3
uses: azure/setup-helm@v4.1.0
with:
version: v3.12.3

- name: Set up Taskfile
uses: arduino/setup-task@v1

- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
Expand All @@ -72,7 +72,7 @@ jobs:
version: v0.20.0

- name: Build image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
push: true
Expand Down Expand Up @@ -120,15 +120,10 @@ jobs:

echo "... done."

- name: Add Summary
if: success() || failure()
run: |
echo "Publishing Job summary... "
cat report_md.md >> $GITHUB_STEP_SUMMARY

- name: Upload HTML report
if: success() || failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ZAP scan report
path: ./report_html.html
retention-days: 1
57 changes: 57 additions & 0 deletions .github/workflows/docusaurus.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: Deploy to GitHub Pages

on:
push:
branches:
- main
paths:
- 'documentation/**'

permissions:
contents: read
deployments: write
pages: write

jobs:
build:
name: Build Docusaurus
runs-on: [ self-hosted, Linux, road-runner, small ]
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0

- uses: actions/setup-node@v4
with:
node-version: 18
cache: yarn
cache-dependency-path: documentation/yarn.lock

- name: Install dependencies
run: yarn --cwd documentation install --frozen-lockfile

- name: Build Documentation
run: yarn --cwd documentation build

- name: Upload Build Artifact
uses: actions/[email protected]
with:
path: documentation/build

deploy:
name: Deploy to GitHub Pages
runs-on: [ self-hosted, Linux, road-runner, small ]
needs: build

permissions:
pages: write
id-token: write

environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}

steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v3
38 changes: 23 additions & 15 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,14 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4

- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v2

- name: Setup Helm
uses: azure/setup-helm@v3
with:
token: ${{ secrets.GITHUB_TOKEN }}
uses: azure/[email protected]

- name: Setup JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'
Expand Down Expand Up @@ -94,15 +95,15 @@ jobs:
run: ./gradlew build

- name: Upload build artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: build
path: ./build
if-no-files-found: error
retention-days: 1

- name: Upload Helm chart artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: charts
path: ./charts
Expand All @@ -114,6 +115,15 @@ jobs:
echo "::notice::${{ env.next_release }}"
echo "::notice::${{ env.will_create_new_release }}"

- name: Upload jar to GitHub release
if: github.event_name != 'pull_request' && steps.semantic-release.outputs.will_create_new_release == 'true'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
RELEASE_VERSION: ${{ steps.semantic-release.outputs.next_release }}
run: |
echo "::notice::Uploading jar to GitHub release"
gh release upload "v$RELEASE_VERSION" ./build/libs/miw-latest.jar

docker:
name: Docker Release
needs: semantic_release
Expand All @@ -122,21 +132,21 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4
- name: Download build artifact
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: build
path: ./build

- name: Download Helm chart artifact
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: charts
path: ./charts

# Create SemVer or ref tags dependent of trigger event
- name: Docker meta
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: |
${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}
Expand All @@ -152,14 +162,14 @@ jobs:

- name: DockerHub login
if: github.event_name != 'pull_request'
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
# Use existing DockerHub credentials present as secrets
username: ${{ secrets.DOCKER_HUB_USER }}
password: ${{ secrets.DOCKER_HUB_TOKEN }}

- name: Push image
uses: docker/build-push-action@v2
uses: docker/build-push-action@v5
with:
context: .
push: ${{ github.event_name != 'pull_request' }}
Expand Down Expand Up @@ -189,15 +199,13 @@ jobs:
uses: actions/checkout@v4

- name: Download Helm chart artifact
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: charts
path: ./charts

- name: Install Helm
uses: azure/setup-helm@v3
with:
token: ${{ secrets.GITHUB_TOKEN }}
uses: azure/[email protected]

- name: Add Helm dependency repositories
run: |
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/veracode.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v3

- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v2

- uses: madhead/read-java-properties@latest
id: version
with:
Expand All @@ -48,20 +51,20 @@ jobs:
- name: Set outputs
id: vars
run: |
echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
echo "{sha_short}=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
echo "SHORT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_ENV

- name: Show version
run: echo ${APP_VERSION}.${SHORT_SHA}

- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'

- name: Build with Gradle
uses: gradle/gradle-build-action@v2
uses: gradle/gradle-build-action@2.4.2
with:
arguments: build

Expand Down
Loading
Loading