Commit Graph
100 Commits
Author SHA1 Message Date
Livio SpringandGitHub 62d679e553 fix: handle password data correct on user creation (#6515) 2023-09-07 14:06:11 +00:00
Livio SpringandGitHub e3e17fe742 chore: update stable to 2.35.1 (#6481) 2023-09-04 09:40:40 +02:00
3c8640fbfd fix: rename (t)otp to code in session checks (#6455)
* fix: rename (t)otp to code in session checks

* update integration tests

---------

Co-authored-by: Fabi <[email protected]>
2023-08-31 07:06:50 +00:00
e17b49e4ca feat: add apple as idp (#6442)
* feat: manage apple idp

* handle apple idp callback

* add tests for provider

* basic console implementation

* implement flow for login UI and add logos / styling

* tests

* cleanup

* add upload button

* begin i18n

* apple logo positioning, file upload component

* fix add apple instance idp

* add missing apple logos for login

* update to go 1.21

* fix slice compare

* revert permission changes

* concrete error messages

* translate login apple logo -y-2px

* change form parsing

* sign in button

* fix tests

* lint console

---------

Co-authored-by: peintnermax <[email protected]>
2023-08-31 08:39:16 +02:00
Livio SpringandGitHub 0d94947d3c fix: rest path for StartIdentityProviderIntent (#6447) 2023-08-30 10:42:24 +02:00
Livio SpringandGitHub 94d13fd3e1 fix(api): handle id_token_mapping in generic oidc provider correctly (#6428) 2023-08-24 10:31:12 +00:00
bb40e173bd feat(api): add otp (sms and email) checks in session api (#6422)
* feat: add otp (sms and email) checks in session api

* implement sending

* fix tests

* add tests

* add integration tests

* fix merge main and add tests

* put default OTP Email url into config

---------

Co-authored-by: Stefan Benz <[email protected]>
2023-08-24 09:41:52 +00:00
Livio SpringandGitHub 66772ad0dd fix: restrict AllowRegistration check to local registration (#5939)
* fix: restrict AllowRegistration check to local registration

* add comment

* add additional tests

* hide registration fields if no registration allowed

* fix: always allow linking and creation of external idps on users in userV2 and admin import

* chore: exclude console dist and node_module folders from cache

* chore: include node_module folders into cache again

* linting
2023-08-23 13:55:52 +02:00
Livio SpringandGitHub cbd2ef0612 fix: use system secret config if generator type does not exist on instance (#6420)
* fix: use system secret config if generator type does not exist on instance

* remove unused idGenerator
2023-08-23 08:04:29 +00:00
Livio SpringandGitHub efcabed04f docs: add technical advisory on allow register (#6413)
* docs: add technical advisory on `allow register`

* typos

* Update technical_advisory.mdx
2023-08-22 17:00:26 +02:00
a9fb2a6e5c fix(api): naming cleanup in user and session service (#6379)
* fix(api): rename first and last name to given and family name, intent to idp_intent, remove _ actions

* fix merge

* fully rename intent to idp intent in api

---------

Co-authored-by: Tim Möhlmann <[email protected]>
2023-08-22 10:05:45 +00:00
Livio SpringandGitHub f03a9d03b6 chore(workflow): exclude console dist folder from cache (#6414)
* empty line for test

* chore: exclude console dist folder from cache
2023-08-22 07:31:41 +02:00
Livio SpringandGitHub e701e05d23 fix(login): add some missing translations for OTP (#6409) 2023-08-21 12:41:39 +00:00
Livio SpringandGitHub 84faf98bc2 fix: setMetadata in saml and pre access token triggers (#6398) 2023-08-21 14:21:45 +02:00
aa2d547eb2 docs: update passkey usage in session api (#6386)
Co-authored-by: Stefan Benz <[email protected]>
2023-08-19 06:26:51 +00:00
Livio SpringandGitHub 69b49ac0ed fix(api): return correct http code on assets api (#6388)
* fix(api): return correct http code on assets api

* add test

* fix test
2023-08-18 13:51:11 +00:00
Livio SpringandGitHub 8b44794c75 fix: delete SMTP correctly (#6391) 2023-08-18 14:22:57 +02:00
Livio SpringandGitHub 90a62b777b fix: handle metadata from post authentication on auto creation (#6389) 2023-08-18 09:16:58 +00:00
Livio SpringandGitHub a99f49999a fix: OTP SMS texts (#6387) 2023-08-18 10:28:08 +02:00
Livio SpringandGitHub 7c494fd219 feat(login): add OTP (email and sms) (#6353)
* feat: login with otp

* fix(i18n): japanese translation

* add missing files

* fix provider change

* add event types translations to en

* add tests

* resourceOwner

* remove unused handler

* fix: secret generators and add comments

* add setup step

* rename

* linting

* fix setup

* improve otp handling

* fix autocomplete

* translations for login and notifications

* translations for event types

* changes from review

* check selected mfa type
2023-08-15 12:47:05 +00:00
Livio SpringandGitHub 372755bddd feat(api): add organisation service (#6340)
* setup org with multiple admins

* tests

* add missing proto

* remove machine users (for now)

* update tests with idp case

* fix package

* organisation -> organization

* fix test
2023-08-11 14:19:14 +00:00
Livio SpringandGitHub e5acfb76b3 test: fix oidc session test (#6342)
* test: fix oidc session test

* fix test
2023-08-10 13:38:30 +00:00
Livio SpringandGitHub 8dc1fd06a1 fix: provide tokens in azuread idp session (#6334) 2023-08-08 09:28:47 +00:00
57857b8d30 fix: check if session is reused on reauthentication (#6322)
* fix: check if session is reused on reauth steps

* add nolint directive

---------

Co-authored-by: Silvan <[email protected]>
2023-08-07 08:01:24 +00:00
Livio SpringandGitHub 45262e6829 fix: migrate external id of federated users (#6312)
* feat: migrate external id

* implement tests and some renaming

* fix projection

* cleanup

* i18n

* fix event type

* handle migration for new services as well

* typo
2023-08-04 11:35:36 +02:00
Livio SpringandGitHub a1942ecdaa feat(api): add and remove OTP (SMS and email) (#6295)
* refactor: rename otp to totp

* feat: add otp sms and email

* implement tests
2023-08-02 18:57:53 +02:00
Livio SpringandGitHub dd480f8a8d feat(login): reuse existing session if no prompt is provided and only single session exists (#6272)
* feat: reuse existing session if no prompt is provided and only single session exists

* fix tests
2023-08-01 11:21:44 +00:00
Livio SpringandGitHub 782f7ad647 fix(OIDC): introspection (#6298)
* fix(OIDC): introspect for PAT

* fix(OIDC): introspect for PAT

* fix(OIDC): introspect

* remove adding projectID into audience
2023-07-31 13:55:26 +00:00
Livio SpringandGitHub 43cb62ca4e fix(i18n): do not translate language itself (#6286) 2023-07-28 09:58:05 +02:00
Livio SpringandGitHub 789dcd8615 fix: password hash update and add missing i18n (#6285) 2023-07-28 09:09:15 +02:00
d3e403f645 perf: reduce events read from eventstore (#6280)
* fix: events query user

* fix: events query user

* user events query

* fix tests

* fix query

* cleanup

---------

Co-authored-by: Fabienne <[email protected]>
2023-07-27 12:10:19 +00:00
Livio SpringandGitHub b0dc02509b docs: fix formatting of idp migration (#6279) 2023-07-27 08:01:36 +00:00
Livio SpringandGitHub 2fe76acd14 feat: add secret generators for OTP (#6262)
This PR adds configuration options for OTP codes through Admin API.
2023-07-26 11:00:41 +00:00
Livio SpringandGitHub 702dfaf314 chore: build release on next branch (#6266) 2023-07-25 08:43:06 +02:00
Livio SpringandGitHub 2183b9a7c5 fix: build css for login correctly (#6265) 2023-07-25 07:52:59 +02:00
Livio SpringandGitHub 13e284dd56 fix: ensure resource owner in update human profile (#6253) 2023-07-21 13:42:24 +00:00
Livio SpringandGitHub 01dce17b14 chore: remove on push and merge_group from pipeline execution (#6254) 2023-07-21 12:37:07 +00:00
Livio SpringandGitHub cd5e176e30 fix: user grant by id (#6242) 2023-07-21 11:04:55 +00:00
Livio SpringandGitHub cfb8f3c07f chore: linting in console (#6243)
chore: linting in console
2023-07-21 06:54:38 +00:00
Livio SpringandGitHub fed15574f6 feat: allow to force MFA local only (#6234)
This PR adds an option to the LoginPolicy to "Force MFA for local users", so that users authenticated through an IDP must not configure (and verify) an MFA.
2023-07-20 04:06:16 +00:00
Livio SpringandGitHub 59f3c328ec feat(OIDC): add support for end_session for V2 tokens (#6226)
This PR adds support for the OIDC end_session_endpoint for V2 tokens. Sending an id_token_hint as parameter will directly terminate the underlying (SSO) session and all its tokens. Without this param, the user will be redirected to the Login UI, where he will able to choose if to logout.
2023-07-19 13:17:39 +02:00
Livio SpringandGitHub e1b3cda98a feat(OIDC): support token revocation of V2 tokens (#6203)
This PR adds support for OAuth2 token revocation of V2 tokens.

Unlike with V1 tokens, it's now possible to revoke a token not only from the authorized client / client which the token was issued to, but rather from all trusted clients (audience)
2023-07-17 14:33:37 +02:00
Livio SpringandGitHub 80961125a7 feat(API): support V2 token and session token usage (#6180)
This PR adds support for userinfo and introspection of V2 tokens. Further V2 access tokens and session tokens can be used for authentication on the ZITADEL API (like the current access tokens).
2023-07-14 11:16:16 +00:00
Livio SpringandGitHub ee26f99ebf fix: store auth methods instead of AMR in auth request linking and OIDC Session (#6192)
This PR changes the information stored on the SessionLinkedEvent and (OIDC Session) AddedEvent from OIDC AMR strings to domain.UserAuthMethodTypes, so no information is lost in the process (e.g. authentication with an IDP)
2023-07-12 12:24:01 +00:00
14b8cf4894 feat(api): add OIDC session service (#6157)
This PR starts the OIDC implementation for the API V2 including the Implicit and Code Flow.


Co-authored-by: Livio Spring <[email protected]>
Co-authored-by: Tim Möhlmann <[email protected]>
Co-authored-by: Stefan Benz <[email protected]>
2023-07-10 13:27:00 +00:00
5cba5cd635 fix: set samesite to none for user agent cookie for iframe usage (#6162)
Co-authored-by: Fabi <[email protected]>
2023-07-10 07:51:56 +02:00
Livio SpringandGitHub 26d63cd233 fix: handle missing parameters in external provider callback (#6158) 2023-07-07 21:04:55 +02:00
6319fdda9e fix: add scope profile to PAT (#6154)
Co-authored-by: Fabi <[email protected]>
2023-07-07 17:31:42 +02:00
Livio SpringandGitHub 59d67bde5f fix: return secret generators (#6159) 2023-07-07 14:46:02 +00:00
a5b4319f1f fix: ignore unchanged console redirect_uris when adding an instance domain (#6156)
Co-authored-by: Fabi <[email protected]>
2023-07-07 14:15:19 +00:00
94fdb9a022 fix: org metadata query (#6161)
Co-authored-by: Fabi <[email protected]>
2023-07-07 15:48:41 +02:00
Livio SpringandGitHub 9fed1a7a5b fix: add font color on new label policy (#6155) 2023-07-07 09:21:10 +00:00
Livio SpringandGitHub bd5defa96a fix: provide domain in session, passkey and u2f (#6097)
This fix provides a possibility to pass a domain on the session, which
will be used (as rpID) to create a passkey / u2f assertion and
attestation. This is useful in cases where the login UI is served under
a different domain / origin than the ZITADEL API.
2023-06-27 14:36:07 +02:00
Livio SpringandGitHub 2c6a2a376c fix: rename OTP to TOTP in v2 alpha user api (#6069)
This change renames the v2 user OTP registration endpoints and objects
to TOTP.
Also the v2 related code paths have been renamed to TOTP.

This change was discussed during the sprint review.

### Definition of Ready

- [ ] I am happy with the code
- [ ] Short description of the feature/issue is added in the pr
description
- [ ] PR is linked to the corresponding user story
- [ ] Acceptance criteria are met
- [ ] All open todos and follow ups are defined in a new ticket and
justified
- [ ] Deviations from the acceptance criteria and design are agreed with
the PO and documented.
- [ ] No debug or dead code
- [ ] My code has no repetitions
- [ ] Critical parts are tested automatically
- [ ] Where possible E2E tests are implemented
- [ ] Documentation/examples are up-to-date
- [ ] All non-functional requirements are met
- [ ] Functionality of the acceptance criteria is checked manually on
the dev system.
2023-06-23 18:58:29 +02:00
Livio SpringandGitHub a0204ade4a Merge branch 'main' into rename-topt 2023-06-23 09:08:51 +02:00
Livio SpringandGitHub 7e6434fa8c fix: event handling on UserIDPLinkWriteModel (#6054) 2023-06-21 06:30:39 +00:00
Livio SpringandGitHub 84085478ec fix(login): ensure auth request information is up-to-date in external user check (#6060) 2023-06-21 05:00:03 +00:00
Livio SpringandGitHub 7046194530 feat(api): list authentication method types in user api v2 (#6058) 2023-06-20 16:23:28 +00:00
Livio SpringandGitHub 82e7333169 feat(api): add password reset and change to user service (#6036)
* feat(api): add password reset and change to user service

* integration tests

* invalidate password check after password change

* handle notification type

* fix proto
2023-06-20 17:34:06 +02:00
Livio SpringandGitHub 1017568cf1 fix: provide more information in the retrieve idp information (#5927)
* fix: provide more information in the retrieve idp information

* change raw_information to proto struct

* change unmarshal

* improve description
2023-06-20 14:39:50 +02:00
Livio SpringandGitHub 1c8037f291 fix: external user check (#6038) 2023-06-16 10:27:43 +02:00
Livio SpringandGitHub e4427380f3 feat: enable grpc server reflection (#5689)
This change enables [gRPC server
reflection](https://github.com/grpc/grpc-go/blob/master/Documentation/server-reflection-tutorial.md).
It allows for easier setting up of dev-tools like
[gRPCurl](https://github.com/fullstorydev/grpcurl) and
[gRPCui](https://github.com/fullstorydev/grpcui).

To see it in action, after you start zitadel on the localhost:

```
go install github.com/fullstorydev/grpcui/cmd/grpcui@latest
grpcui -plaintext localhost:8080
````


![image](https://user-images.githubusercontent.com/5411563/232060184-1a114640-e87a-48da-866f-ff8d597e790f.png)
2023-05-16 11:17:20 +02:00
Livio SpringandGitHub 383e68b819 Merge branch 'main' into grcp-server-reflect 2023-05-16 10:51:32 +02:00
Livio SpringandGitHub a77f299168 fix(eventstore): add created_at column (#5818)
### Definition of Ready

- [x] I am happy with the code
- [ ] Short description of the feature/issue is added in the pr
description
- [ ] PR is linked to the corresponding user story
- [ ] Acceptance criteria are met
- [ ] All open todos and follow ups are defined in a new ticket and
justified
- [ ] Deviations from the acceptance criteria and design are agreed with
the PO and documented.
- [ ] No debug or dead code
- [ ] Critical parts are tested automatically
- [ ] Where possible E2E tests are implemented
- [ ] Documentation/examples are up-to-date
- [ ] All non-functional requirements are met
- [ ] Functionality of the acceptance criteria is checked manually on
the dev system.
2023-05-16 09:08:54 +02:00
Livio SpringandGitHub 2962870bdd Merge branch 'main' into eventstore-created-at 2023-05-16 08:44:25 +02:00
Livio SpringandGitHub c07411e314 fix: only reuse port for integration tests (#5817)
* fix: only reuse port for integration tests

* exclude default listenConfig from integration build
2023-05-11 08:58:35 +00:00
c2cb84cd24 feat(api): new session service (#5801)
* backup new protoc plugin

* backup

* session

* backup

* initial implementation

* change to specific events

* implement tests

* cleanup

* refactor: use new protoc plugin for api v2

* change package

* simplify code

* cleanup

* cleanup

* fix merge

* start queries

* fix tests

* improve returned values

* add token to projection

* tests

* test db map

* update query

* permission checks

* fix tests and linting

* rework token creation

* i18n

* refactor token check and fix tests

* session to PB test

* request to query tests

* cleanup proto

* test user check

* add comment

* simplify database map type

* Update docs/docs/guides/integrate/access-zitadel-system-api.md

Co-authored-by: Tim Möhlmann <[email protected]>

* fix test

* cleanup

* docs

---------

Co-authored-by: Tim Möhlmann <[email protected]>
2023-05-05 15:34:53 +00:00
Livio SpringandGitHub f1534c0c4c refactor: use new protoc plugin for api v2 (#5798)
* refactor: use new protoc plugin for api v2

* simplify code
2023-05-04 08:50:19 +00:00
Livio SpringandGitHub e0505b2def fix: use correct org id for external authentication actions (#5793) 2023-05-02 16:03:33 +00:00
Livio SpringandGitHub 458a383de2 fix: use current sequence for refetching of events (#5772)
* fix: use current sequence for refetching of events

* fix: use client ids
2023-04-28 16:28:13 +02:00
Livio SpringandGitHub 6774e7f444 fix: handle userID and context correctly (#5755)
* fix: handle userID and context correctly

* fix linting
2023-04-26 16:19:32 +02:00
e4a4b7cfbe feat(api): add user creation to user service (#5745)
* chore(proto): update versions

* change protoc plugin

* some cleanups

* define api for setting emails in new api

* implement user.SetEmail

* move SetEmail buisiness logic into command

* resuse newCryptoCode

* command: add ChangeEmail unit tests

Not complete, was not able to mock the generator.

* Revert "resuse newCryptoCode"

This reverts commit c89e90ae35ae924a3f706a0a7394f933910c2e65.

* undo change to crypto code generators

* command: use a generator so we can test properly

* command: reorganise ChangeEmail

improve test coverage

* implement VerifyEmail

including unit tests

* add URL template tests

* begin user creation

* change protos

* implement metadata and move context

* merge commands

* proto: change context to object

* remove old auth option

* remove old auth option

* fix linting errors

run gci on modified files

* add permission checks and fix some errors

* comments

* comments

* update email requests

* rename proto requests

* cleanup and docs

* simplify

* simplify

* fix setup

* remove unused proto messages / fields

---------

Co-authored-by: adlerhurst <[email protected]>
Co-authored-by: Tim Möhlmann <[email protected]>
2023-04-26 07:47:57 +02:00
Livio SpringandGitHub 429a91518b fix: remove idp templates when using old / deprecated delete method (#5685)
* fix: remove idp templates when using old / deprecated delete method

* fix: projection version
2023-04-17 08:20:49 +00:00
4c482619da fix: ensure minimal scope for azure ad (#5686)
* fix: ensure minimal scope for azure ad

* docs(idps): mention scopes which are always sent

---------

Co-authored-by: adlerhurst <[email protected]>
2023-04-17 07:02:16 +00:00
Livio SpringandGitHub 8e19f0f6c3 fix: set displayname correctly in EnsureDisplayName (#5702)
fix: EnsureDisplayName
2023-04-17 06:26:40 +00:00
Livio SpringandGitHub 8bf36301ed feat: allow skip of success page for native apps (#5627)
add possibility to return to callback directly after login without rendering the successful login page
2023-04-11 15:07:32 +00:00
b3d8787921 feat: add new api services (#5619)
* feat: add new services

* improve demos and comments

* remove unused field

* add comment to demo proto calls

* Apply suggestions from code review

Co-authored-by: Silvan <[email protected]>

---------

Co-authored-by: Silvan <[email protected]>
2023-04-11 15:37:42 +02:00
Livio SpringandGitHub 23e6cc325e fix: update correct current sequence for refresh tokens (#5608) 2023-04-05 21:31:51 +02:00
ea9223a2b0 fix: remove instance IDPs correctly from org policies (#5609)
Co-authored-by: Silvan <[email protected]>
2023-04-05 11:18:00 +00:00
Livio SpringandGitHub 991a56341b fix: role claims mapping (#5601)
* fix: role claims mapping

* update oidc pkg

* update oidc pkg
2023-04-04 12:36:39 +00:00
Livio SpringandGitHub 99e8c5c175 chore: update stable to 2.21.3 (#5514) 2023-03-29 14:07:23 +00:00
Livio SpringandGitHub 1cf84b5a56 fix: map metadata correctly in actions (#5526) 2023-03-23 14:28:53 +01:00
Livio SpringandGitHub fca6dd9613 fix: reduce correct type for jwt idps (#5519) 2023-03-22 15:46:59 +00:00
Livio SpringandGitHub a6c471b2e4 fix: possible nil pointer in actions (#5510) 2023-03-21 11:19:49 +01:00
Livio SpringandGitHub 4ca50e0802 fix: check for empty applicationID on assertRoles (#5509)
* fix: check for empty applicationID on assertRoles

* remove unintended added file
2023-03-21 08:59:44 +01:00
Livio SpringandGitHub 1896f13952 fix: use idToken for mapping when using old configs (#5458)
* fix: use idToken for mapping when using old configs

* fix events and add tests
2023-03-16 16:47:22 +01:00
Livio SpringandGitHub a8a2edadc2 fix: use correct resource owner in checkExternalUserLogin (#5457) 2023-03-16 13:14:08 +00:00
Livio SpringandGitHub 5a307afe62 feat: add azure provider templates (#5441)
Adds possibility to manage and use Microsoft Azure template based providers
2023-03-15 07:48:37 +01:00
c0843e6b4c feat: add gitlab provider templates (#5405)
* feat(api): add google provider template

* refactor reduce functions

* handle removed event

* linting

* fix projection

* feat(api): add generic oauth provider template

* feat(api): add github provider templates

* feat(api): add github provider templates

* fixes

* proto comment

* fix filtering

* requested changes

* feat(api): add generic oauth provider template

* remove wrongly committed message

* increase budget for angular build

* fix linting

* fixes

* fix merge

* fix merge

* fix projection

* fix merge

* updates from previous PRs

* enable github providers in login

* fix merge

* fix test and add github styling in login

* cleanup

* feat(api): add gitlab provider templates

* fix: merge

* fix display of providers in login

* implement gitlab in login and make prompt `select_account` optional since gitlab can't handle it

* fix merge

* fix merge and add tests for command side

* requested changes

* requested changes

* Update internal/query/idp_template.go

Co-authored-by: Silvan <[email protected]>

* fix merge

* requested changes

---------

Co-authored-by: Silvan <[email protected]>
2023-03-13 17:34:29 +01:00
Livio SpringandGitHub 1ec6c451ca chore: update stable to 2.19.4 (#5269)
* chore: update stable to 2.19.3

* 2.19.4
2023-03-10 15:31:10 +01:00
Livio SpringandGitHub 26fdc3e84e fix(api): return id_attribute of oauth provider (#5397) 2023-03-09 06:13:43 +00:00
Livio SpringandGitHub 8cbde57047 fix(api): allow HTTP/1.1 for grpc-web (#5376)
Handles grpc-web on HTTP/1.1 with H2C for HTTP/2, but does not enforce it.
2023-03-08 18:33:43 +00:00
Livio SpringandGitHub 3042d7ef5c feat: add github provider template (#5334)
Adds possibility to manage and use GitHub (incl. Enterprise Server) template based providers
2023-03-08 10:17:28 +00:00
Livio SpringandGitHub b2786d8c68 fix: handling of (old) IDPConfigChangedEvent projection (#5384) 2023-03-07 11:35:47 +01:00
Livio SpringandGitHub 2efa305e10 fix: use of generic oauth provider (#5345)
Adds a id_attribute to the GenericOAuthProvider, which is used to map the external User. Further mapping can be done in actions by using the `rawInfo` of the new `ctx.v1.providerInfo` field.
2023-03-03 10:38:49 +00:00
Livio SpringandGitHub 966df56026 fix(providers): set prompt select_account again (#5329) 2023-03-01 07:17:51 +00:00
Livio SpringandGitHub 48f9815b7c feat(login): use new IDP templates (#5315)
The login uses the new template based IDPs with backwards compatibility for old IDPs
2023-02-28 21:20:58 +01:00
Livio SpringandGitHub 80003939ad feat(api): add oidc and jwt provider template (#5290)
Adds possibility to manage OIDC and JWT template based providers
2023-02-27 16:32:18 +01:00
82ffd6dffb fix(actions): provide browser info and handle nil pointer (#5277)
* fix(actions): provide browser info and handle nil pointer

* fix(actions): use correct user id in post registration

---------

Co-authored-by: adlerhurst <[email protected]>
2023-02-24 16:13:11 +01:00
Livio SpringandGitHub 737d14e81b feat(api): add generic oauth provider template (#5260)
adds functionality to manage templates based OIDC IDPs
2023-02-24 15:16:06 +01:00