johanels/photoprism
1
0
Fork 0
mirror of https://github.com/photoprism/photoprism.git synced 2025-12-12 00:34:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

OIDC: Update test endpoint URLs #782

Browse Source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer
2024-06-27 22:55:59 +02:00
parent 67c8f06f43
commit f10809329f
7 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
compose.yaml
View File

@@ -46,7 +46,8 @@ services:
PHOTOPRISM_REGISTER_URI: "https://keycloak.localssl.dev/admin/" PHOTOPRISM_REGISTER_URI: "https://keycloak.localssl.dev/admin/"
PHOTOPRISM_PASSWORD_RESET_URI: "https://keycloak.localssl.dev/realms/master/login-actions/reset-credentials" PHOTOPRISM_PASSWORD_RESET_URI: "https://keycloak.localssl.dev/realms/master/login-actions/reset-credentials"
## OpenID Connect (pre-configured for local tests): ## OpenID Connect (pre-configured for local tests):
PHOTOPRISM_OIDC_URI: "https://keycloak.localssl.dev/auth/realms/master" ## see https://keycloak.localssl.dev/realms/master/.well-known/openid-configuration
PHOTOPRISM_OIDC_URI: "https://keycloak.localssl.dev/realms/master"
PHOTOPRISM_OIDC_INSECURE: "true" PHOTOPRISM_OIDC_INSECURE: "true"
PHOTOPRISM_OIDC_CLIENT: "photoprism-develop" PHOTOPRISM_OIDC_CLIENT: "photoprism-develop"
PHOTOPRISM_OIDC_SECRET: "9d8351a0-ca01-4556-9c37-85eb634869b9" PHOTOPRISM_OIDC_SECRET: "9d8351a0-ca01-4556-9c37-85eb634869b9"
@@ -177,7 +178,7 @@ services:
## Dummy OpenID Connect Provider ## Dummy OpenID Connect Provider
dummy-oidc: dummy-oidc:
image: photoprism/dummy-oidc:240131 image: photoprism/dummy-oidc:240627
container_name: dummy-oidc container_name: dummy-oidc
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
@@ -191,7 +192,7 @@ services:
## Dummy WebDAV Server ## Dummy WebDAV Server
dummy-webdav: dummy-webdav:
image: photoprism/dummy-webdav:240131 image: photoprism/dummy-webdav:240627
container_name: dummy-webdav container_name: dummy-webdav
environment: environment:
WEBDAV_USERNAME: admin WEBDAV_USERNAME: admin
@@ -210,7 +211,7 @@ services:
## Login: user / photoprism ## Login: user / photoprism
## Admin: admin / photoprism ## Admin: admin / photoprism
keycloak: keycloak:
image: quay.io/keycloak/keycloak:24.0 image: quay.io/keycloak/keycloak:25.0
container_name: keycloak container_name: keycloak
profiles: ["all", "auth", "keycloak"] profiles: ["all", "auth", "keycloak"]
command: "start-dev" # development mode, do not use this in production! command: "start-dev" # development mode, do not use this in production!

3
docker/dummy/oidc/Dockerfile
View File

@@ -11,7 +11,8 @@ RUN go mod download
RUN go build -o server . RUN go build -o server .
# Allow HTTP scheme # Allow HTTP scheme
ENV CAOS_OIDC_DEV=true ENV CAOS_OIDC_DEV="true" \
ZITADEL_OIDC_DEV="true"
# Expose HTTP port # Expose HTTP port
EXPOSE 9998 EXPOSE 9998

3
docker/dummy/oidc/app/mock/storage.go
View File

@@ -312,7 +312,8 @@ func (c *ConfClient) RedirectURIs() []string {
"https://localhost:8443/test/a/instructions-example/callback", "https://localhost:8443/test/a/instructions-example/callback",
"https://op.certification.openid.net:62064/authz_cb", "https://op.certification.openid.net:62064/authz_cb",
"https://op.certification.openid.net:62064/authz_post", "https://op.certification.openid.net:62064/authz_post",
"http://localhost:2342/api/v1/auth/callback", "http://localhost:2342/api/v1/oidc/redirect",
"https://app.localssl.dev/api/v1/oidc/redirect",
} }
} }
func (c *ConfClient) PostLogoutRedirectURIs() []string { func (c *ConfClient) PostLogoutRedirectURIs() []string {

4
docker/dummy/webdav/Dockerfile
View File

@@ -7,8 +7,8 @@ WORKDIR "/webdav"
RUN go install github.com/hacdias/webdav@latest RUN go install github.com/hacdias/webdav@latest
ENV WEBDAV_USERNAME admin ENV WEBDAV_USERNAME="admin" \
ENV WEBDAV_PASSWORD photoprism WEBDAV_PASSWORD="photoprism"
# Expose HTTP port # Expose HTTP port
EXPOSE 80 EXPOSE 80

13
internal/oidc/httpclient.go → internal/oidc/http_client.go
View File

@@ -8,16 +8,21 @@ import (
) )
// HttpClient represents a client that makes HTTP requests. // HttpClient represents a client that makes HTTP requests.
//
// NOTE: Timeout specifies a time limit for requests made by
// this Client. The timeout includes connection time, any
// redirects, and reading the response body. The timer remains
// running after Get, Head, Post, or Do return and will
// interrupt reading of the Response.Body.
func HttpClient(debug bool) *http.Client { func HttpClient(debug bool) *http.Client {
if debug { if debug {
return &http.Client{ return &http.Client{
Transport: LoggingRoundTripper{http.DefaultTransport}, Transport: LoggingRoundTripper{http.DefaultTransport},
Timeout: time.Second * 10, Timeout: time.Second * 20,
} }
} }
cl := http.DefaultClient
cl.Timeout = time.Second * 10 return &http.Client{Timeout: 20 * time.Second}
return cl
} }
// LoggingRoundTripper specifies the http.RoundTripper interface. // LoggingRoundTripper specifies the http.RoundTripper interface.

0
internal/oidc/httpclient_test.go → internal/oidc/http_client_test.go
View File

2
scripts/sql/mariadb-init.sql
View File

@@ -1886,7 +1886,7 @@ CREATE TABLE `REDIRECT_URIS` (
LOCK TABLES `REDIRECT_URIS` WRITE; LOCK TABLES `REDIRECT_URIS` WRITE;
/*!40000 ALTER TABLE `REDIRECT_URIS` DISABLE KEYS */; /*!40000 ALTER TABLE `REDIRECT_URIS` DISABLE KEYS */;
INSERT INTO `REDIRECT_URIS` VALUES ('4e4977d6-eaa9-4245-ae4c-04d20f5436d9','/realms/master/account/*'),('54905dd0-4ade-494e-9c35-ab2d445a99f5','/realms/master/account/*'),('5a059221-51fd-434f-84a6-40fa51cda5ce','https://app.localssl.dev/api/v1/auth/callback'),('bda020f6-dd7f-4bb8-b565-bdc8edb9a8fc','/admin/master/console/*'); INSERT INTO `REDIRECT_URIS` VALUES ('4e4977d6-eaa9-4245-ae4c-04d20f5436d9','/realms/master/account/*'),('54905dd0-4ade-494e-9c35-ab2d445a99f5','/realms/master/account/*'),('5a059221-51fd-434f-84a6-40fa51cda5ce','https://app.localssl.dev/api/v1/oidc/redirect'),('bda020f6-dd7f-4bb8-b565-bdc8edb9a8fc','/admin/master/console/*');
/*!40000 ALTER TABLE `REDIRECT_URIS` ENABLE KEYS */; /*!40000 ALTER TABLE `REDIRECT_URIS` ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;