TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-14 07:07:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: add oidc idp for acceptance tests

Browse Source
This commit is contained in:
Stefan Benz
2025-03-28 18:25:30 +01:00
parent e5604edff8
commit f55d64b51f
4 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
acceptance/docker-compose.yaml
View File

@@ -1,7 +1,7 @@
services: services:
zitadel: zitadel:
user: "${ZITADEL_DEV_UID}" user: "${ZITADEL_DEV_UID}"
image: "${ZITADEL_IMAGE:-ghcr.io/zitadel/zitadel:dc64e35128108d70471c7a5b9ad1dfc2c7c4c654}" image: "${ZITADEL_IMAGE:-ghcr.io/zitadel/zitadel:02617cf17fdde849378c1a6b5254bbfb2745b164}"
command: 'start-from-init --masterkey "MasterkeyNeedsToHave32Characters" --tlsMode disabled --config /zitadel.yaml --steps /zitadel.yaml' command: 'start-from-init --masterkey "MasterkeyNeedsToHave32Characters" --tlsMode disabled --config /zitadel.yaml --steps /zitadel.yaml'
ports: ports:
- "8080:8080" - "8080:8080"
@@ -12,7 +12,7 @@ services:
db: db:
condition: "service_healthy" condition: "service_healthy"
extra_hosts: extra_hosts:
- "host.docker.internal:host-gateway" - "localhost:host-gateway"
db: db:
restart: "always" restart: "always"

2
acceptance/idp/oidc/main.go
View File

@@ -127,7 +127,7 @@ func CreateIDP(apiURL, pat, domain string, issuer, clientID, clientSecret string
IsCreationAllowed: true, IsCreationAllowed: true,
IsAutoCreation: true, IsAutoCreation: true,
IsAutoUpdate: true, IsAutoUpdate: true,
AutoLinking: "AUTO_LINKING_OPTION_UNSPECIFIED", AutoLinking: "AUTO_LINKING_OPTION_USERNAME",
}, },
IsIdTokenMapping: false, IsIdTokenMapping: false,
UsePkce: false, UsePkce: false,

22
acceptance/idp/saml/main.go
View File

@@ -12,6 +12,7 @@ import (
"io" "io"
"log" "log"
"net/http" "net/http"
"net/http/httptest"
"net/url" "net/url"
"os" "os"
"os/signal" "os/signal"
@@ -24,6 +25,7 @@ import (
xrv "github.com/mattermost/xml-roundtrip-validator" xrv "github.com/mattermost/xml-roundtrip-validator"
"github.com/zenazn/goji" "github.com/zenazn/goji"
"github.com/zenazn/goji/bind" "github.com/zenazn/goji/bind"
"github.com/zenazn/goji/web"
"golang.org/x/crypto/bcrypt" "golang.org/x/crypto/bcrypt"
) )
@@ -156,18 +158,12 @@ func addService(idpServer *samlidp.Server, spURLStr string) {
panic(err) panic(err)
} }
defer metadataResp.Body.Close() defer metadataResp.Body.Close()
spMetadata, err := getSPMetadata(metadataResp.Body)
if err != nil {
panic(err)
}
err = idpServer.Store.Put("/services/sp", samlidp.Service{ idpServer.HandlePutService(
Name: spURLStr, web.C{URLParams: map[string]string{"id": spURLStr}},
Metadata: *spMetadata, httptest.NewRecorder(),
}) httptest.NewRequest(http.MethodPost, spURLStr, metadataResp.Body),
if err != nil { )
panic(err)
}
} }
func getSPMetadata(r io.Reader) (spMetadata *saml.EntityDescriptor, err error) { func getSPMetadata(r io.Reader) (spMetadata *saml.EntityDescriptor, err error) {
@@ -267,8 +263,8 @@ func CreateIDP(apiURL, pat, domain string, idpMetadata []byte) (string, error) {
createIDP := &createIDP{ createIDP := &createIDP{
Name: "CREWJAM", Name: "CREWJAM",
MetadataXml: string(encoded), MetadataXml: string(encoded),
Binding: "SAML_BINDING_POST", Binding: "SAML_BINDING_REDIRECT",
WithSignedRequest: true, WithSignedRequest: false,
ProviderOptions: providerOptions{ ProviderOptions: providerOptions{
IsLinkingAllowed: true, IsLinkingAllowed: true,
IsCreationAllowed: true, IsCreationAllowed: true,

4
acceptance/tests/saml-username-password.spec.ts
View File

@@ -1,5 +1,5 @@
import { faker } from "@faker-js/faker"; import { faker } from "@faker-js/faker";
import { test as base } from "@playwright/test"; import {expect, test as base} from "@playwright/test";
import dotenv from "dotenv"; import dotenv from "dotenv";
import path from "path"; import path from "path";
import { loginname } from "./loginname"; import { loginname } from "./loginname";
@@ -35,5 +35,5 @@ test("saml username and password login", async ({ user, page }) => {
await selectNewAccount(page) await selectNewAccount(page)
await loginname(page, user.getUsername()); await loginname(page, user.getUsername());
await password(page, user.getPassword()); await password(page, user.getPassword());
// currently fails because of issuer problems await expect(page.locator('html')).toContainText(user.getUsername());
}); });