diff --git a/app/Actions/Fortify/CreateNewUser.php b/app/Actions/Fortify/CreateNewUser.php index d437a3a17..44a03c17d 100644 --- a/app/Actions/Fortify/CreateNewUser.php +++ b/app/Actions/Fortify/CreateNewUser.php @@ -32,7 +32,7 @@ public function __construct(private readonly Request $request) {} public function create(array $input): User { $settings = instanceSettings(); - if (! $settings->isPasswordRegistrationAllowed()) { + if (! $settings->is_registration_enabled) { abort(403); } diff --git a/app/Actions/Server/CheckUpdates.php b/app/Actions/Server/CheckUpdates.php index 5cf5658f8..f90e00708 100644 --- a/app/Actions/Server/CheckUpdates.php +++ b/app/Actions/Server/CheckUpdates.php @@ -3,7 +3,6 @@ namespace App\Actions\Server; use App\Models\Server; -use Illuminate\Support\Facades\Log; use Lorisleiva\Actions\Concerns\AsAction; class CheckUpdates @@ -107,15 +106,6 @@ public function handle(Server $server) $out['osId'] = $osId; $out['package_manager'] = $packageManager; - return $out; - case 'apk': - instant_remote_process(['apk update -q'], $server); - $output = instant_remote_process(['LANG=C apk list --upgradable 2>/dev/null'], $server); - - $out = $this->parseApkOutput($output); - $out['osId'] = $osId; - $out['package_manager'] = $packageManager; - return $out; default: return [ @@ -276,39 +266,11 @@ private function parsePacmanOutput(string $output): array // Include unparsed lines in the result for debugging if any exist if (! empty($unparsedLines)) { $result['unparsed_lines'] = $unparsedLines; - Log::debug('Pacman output contained unparsed lines', [ + \Illuminate\Support\Facades\Log::debug('Pacman output contained unparsed lines', [ 'unparsed_lines' => $unparsedLines, ]); } return $result; } - - private function parseApkOutput(string $output): array - { - $updates = []; - $lines = explode("\n", $output); - - foreach ($lines as $line) { - // Skip empty lines - if (empty($line)) { - continue; - } - - // Example line: docker-cli-compose-2.31.0-r5 x86_64 {docker-cli-compose} (Apache-2.0) [upgradable from: docker-cli-compose-2.31.0-r4] - if (preg_match('/^(.+)-([0-9]\S*) (\S+) \{\S+\} \([^)]+\) \[upgradable from: .+?-([0-9][^\]]+)\]$/', $line, $matches)) { - $updates[] = [ - 'package' => $matches[1], - 'new_version' => $matches[2], - 'architecture' => $matches[3], - 'current_version' => $matches[4], - ]; - } - } - - return [ - 'total_updates' => count($updates), - 'updates' => $updates, - ]; - } } diff --git a/app/Actions/Server/InstallDocker.php b/app/Actions/Server/InstallDocker.php index 552445d72..2e08ec6ad 100644 --- a/app/Actions/Server/InstallDocker.php +++ b/app/Actions/Server/InstallDocker.php @@ -79,8 +79,6 @@ public function handle(Server $server) $command = $command->merge([$this->getSuseDockerInstallCommand()]); } elseif ($supported_os_type->contains('arch')) { $command = $command->merge([$this->getArchDockerInstallCommand()]); - } elseif ($supported_os_type->contains('alpine')) { - $command = $command->merge([$this->getAlpineDockerInstallCommand()]); } else { $command = $command->merge([$this->getGenericDockerInstallCommand()]); } @@ -95,8 +93,9 @@ public function handle(Server $server) "jq -s '.[0] * .[1]' /etc/docker/daemon.json.coolify /etc/docker/daemon.json | tee /etc/docker/daemon.json.appended > /dev/null", 'mv /etc/docker/daemon.json.appended /etc/docker/daemon.json', "echo 'Restarting Docker Engine...'", + 'systemctl enable docker >/dev/null 2>&1 || true', + 'systemctl restart docker', ]); - $command = $command->merge($this->getDockerServiceCommands($supported_os_type->contains('alpine'))); if ($server->isSwarm()) { $command = $command->merge([ 'docker network create --attachable --driver overlay coolify-overlay >/dev/null 2>&1 || true', @@ -155,28 +154,6 @@ private function getArchDockerInstallCommand(): string 'systemctl start docker.service'; } - private function getAlpineDockerInstallCommand(): string - { - return 'apk update && '. - 'apk add docker docker-cli-buildx docker-cli-compose && '. - 'mkdir -p /etc/docker'; - } - - private function getDockerServiceCommands(bool $usesOpenRc): array - { - if ($usesOpenRc) { - return [ - 'rc-update add docker default', - 'rc-service docker restart', - ]; - } - - return [ - 'systemctl enable docker >/dev/null 2>&1 || true', - 'systemctl restart docker', - ]; - } - private function getGenericDockerInstallCommand(): string { return 'curl -fsSL https://get.docker.com | sh'; diff --git a/app/Actions/Server/InstallPrerequisites.php b/app/Actions/Server/InstallPrerequisites.php index 57fd4f1d7..84be7f206 100644 --- a/app/Actions/Server/InstallPrerequisites.php +++ b/app/Actions/Server/InstallPrerequisites.php @@ -53,8 +53,6 @@ public function handle(Server $server) "echo 'Installing Prerequisites for Arch Linux...'", 'pacman -Syu --noconfirm --needed curl wget git jq', ]); - } elseif ($supported_os_type->contains('alpine')) { - $command = $command->merge($this->getAlpinePrerequisiteCommands()); } else { throw new \Exception('Unsupported OS type for prerequisites installation'); } @@ -63,18 +61,4 @@ public function handle(Server $server) return remote_process($command, $server); } - - private function getAlpinePrerequisiteCommands(): array - { - return [ - "echo 'Installing Prerequisites for Alpine Linux...'", - "sed -i '/^#.*\\/community/s/^#//' /etc/apk/repositories 2>/dev/null || true", - 'apk update', - 'command -v bash >/dev/null || apk add bash', - 'command -v curl >/dev/null || apk add curl', - 'command -v wget >/dev/null || apk add wget', - 'command -v git >/dev/null || apk add git', - 'command -v jq >/dev/null || apk add jq', - ]; - } } diff --git a/app/Actions/Server/UpdatePackage.php b/app/Actions/Server/UpdatePackage.php index 2b06e0601..ab0ca9494 100644 --- a/app/Actions/Server/UpdatePackage.php +++ b/app/Actions/Server/UpdatePackage.php @@ -58,10 +58,6 @@ public function handle(Server $server, string $osId, ?string $package = null, ?s $commandAll = 'pacman -Syu --noconfirm'; $commandInstall = 'pacman -S --noconfirm '.$sanitizedPackage; break; - case 'apk': - $commandAll = 'apk update && apk upgrade'; - $commandInstall = 'apk upgrade '.$sanitizedPackage; - break; default: return [ 'error' => 'OS not supported', diff --git a/app/Auth/Oidc/Exceptions/OidcDiscoveryException.php b/app/Auth/Oidc/Exceptions/OidcDiscoveryException.php deleted file mode 100644 index e4a2ba0df..000000000 --- a/app/Auth/Oidc/Exceptions/OidcDiscoveryException.php +++ /dev/null @@ -1,5 +0,0 @@ - $scopes - */ - public function __construct( - public string $issuerUrl, - public string $clientId, - public string $clientSecret, - public string $redirectUri, - public array $scopes = ['openid', 'email', 'profile'], - public bool $usePkce = true, - public int $clockSkewSeconds = 60, - ) {} - - public static function fromOauthSetting(OauthSetting $setting): self - { - return new self( - issuerUrl: rtrim((string) $setting->base_url, '/'), - clientId: (string) $setting->client_id, - clientSecret: (string) $setting->client_secret, - redirectUri: filled($setting->redirect_uri) ? $setting->redirect_uri : route('auth.callback', 'oidc'), - scopes: $setting->scopeList(), - usePkce: $setting->use_pkce ?? true, - clockSkewSeconds: $setting->clock_skew_seconds ?? 60, - ); - } -} diff --git a/app/Auth/Oidc/OidcDiscoveryDocument.php b/app/Auth/Oidc/OidcDiscoveryDocument.php deleted file mode 100644 index d17061c51..000000000 --- a/app/Auth/Oidc/OidcDiscoveryDocument.php +++ /dev/null @@ -1,61 +0,0 @@ - $supportedScopes - * @param array $supportedClaims - * @param array $idTokenSigningAlgValuesSupported - */ - public function __construct( - public string $issuer, - public string $authorizationEndpoint, - public string $tokenEndpoint, - public string $userinfoEndpoint, - public string $jwksUri, - public ?string $endSessionEndpoint = null, - public array $supportedScopes = [], - public array $supportedClaims = [], - public array $idTokenSigningAlgValuesSupported = [], - ) {} - - /** - * @param array $payload - */ - public static function fromArray(array $payload): self - { - foreach (['issuer', 'authorization_endpoint', 'token_endpoint', 'userinfo_endpoint', 'jwks_uri'] as $field) { - if (! is_string($payload[$field] ?? null) || trim($payload[$field]) === '') { - throw new OidcDiscoveryException("Discovery document is missing required field: {$field}"); - } - } - - return new self( - issuer: $payload['issuer'], - authorizationEndpoint: $payload['authorization_endpoint'], - tokenEndpoint: $payload['token_endpoint'], - userinfoEndpoint: $payload['userinfo_endpoint'], - jwksUri: $payload['jwks_uri'], - endSessionEndpoint: is_string($payload['end_session_endpoint'] ?? null) ? $payload['end_session_endpoint'] : null, - supportedScopes: self::stringList($payload['scopes_supported'] ?? []), - supportedClaims: self::stringList($payload['claims_supported'] ?? []), - idTokenSigningAlgValuesSupported: self::stringList($payload['id_token_signing_alg_values_supported'] ?? []), - ); - } - - /** - * @return array - */ - private static function stringList(mixed $value): array - { - if (! is_array($value)) { - return []; - } - - return array_values(array_map('strval', $value)); - } -} diff --git a/app/Auth/Oidc/OidcDiscoveryService.php b/app/Auth/Oidc/OidcDiscoveryService.php deleted file mode 100644 index 0847afc9a..000000000 --- a/app/Auth/Oidc/OidcDiscoveryService.php +++ /dev/null @@ -1,97 +0,0 @@ -assertHttpsUrl($issuerUrl, new OidcDiscoveryException('Issuer URL must be an absolute HTTPS URL.')); - - $issuerUrl = rtrim($issuerUrl, '/'); - $cacheKey = 'oidc:discovery:'.hash('sha256', $issuerUrl); - - return Cache::remember($cacheKey, 3600, function () use ($issuerUrl): OidcDiscoveryDocument { - $url = $issuerUrl.'/.well-known/openid-configuration'; - - try { - $response = Http::timeout(5)->connectTimeout(3)->acceptJson()->get($url); - } catch (Throwable $e) { - throw new OidcDiscoveryException("Failed to fetch discovery document: {$e->getMessage()}", previous: $e); - } - - if ($response->failed()) { - throw new OidcDiscoveryException("Discovery endpoint returned HTTP {$response->status()}"); - } - - $json = $response->json(); - if (! is_array($json) || $json === []) { - throw new OidcDiscoveryException('Discovery endpoint returned invalid JSON.'); - } - - $discovery = OidcDiscoveryDocument::fromArray($json); - if (rtrim($discovery->issuer, '/') !== $issuerUrl) { - throw new OidcDiscoveryException('Discovery issuer does not match the configured issuer URL.'); - } - - return $discovery; - }); - } - - /** - * Fetch the JWKS for the given URI. - * - * When $forceRefresh is true the cached document is bypassed so freshly - * rotated signing keys become visible immediately. A short cooldown still - * prevents a flood of upstream requests if many logins miss the same kid. - * - * @return array - */ - public function jwks(string $jwksUri, bool $forceRefresh = false): array - { - $this->assertHttpsUrl($jwksUri, new OidcJwksException('JWKS URI must be an absolute HTTPS URL.')); - - $cacheKey = 'oidc:jwks:'.hash('sha256', $jwksUri); - - if ($forceRefresh) { - $cooldownKey = $cacheKey.':refresh'; - if (Cache::add($cooldownKey, true, 60)) { - Cache::forget($cacheKey); - } - } - - return Cache::remember($cacheKey, 21600, function () use ($jwksUri): array { - try { - $response = Http::timeout(5)->connectTimeout(3)->acceptJson()->get($jwksUri); - } catch (Throwable $e) { - throw new OidcJwksException("Failed to fetch JWKS: {$e->getMessage()}", previous: $e); - } - - if ($response->failed()) { - throw new OidcJwksException("JWKS endpoint returned HTTP {$response->status()}"); - } - - $json = $response->json(); - if (! is_array($json) || ! is_array($json['keys'] ?? null)) { - throw new OidcJwksException("JWKS endpoint returned an invalid payload without 'keys'."); - } - - return $json; - }); - } - - private function assertHttpsUrl(string $url, Throwable $exception): void - { - $parts = parse_url($url); - - if (($parts['scheme'] ?? null) !== 'https' || ! is_string($parts['host'] ?? null) || $parts['host'] === '') { - throw $exception; - } - } -} diff --git a/app/Auth/Oidc/OidcTokenValidator.php b/app/Auth/Oidc/OidcTokenValidator.php deleted file mode 100644 index a8563611d..000000000 --- a/app/Auth/Oidc/OidcTokenValidator.php +++ /dev/null @@ -1,199 +0,0 @@ - $jwks - * @return array - */ - public function validate( - string $idToken, - OidcDiscoveryDocument $discovery, - array $jwks, - string $clientId, - ?string $expectedNonce = null, - int $clockSkewSeconds = 60, - ): array { - $kid = $this->extractKid($idToken); - - try { - $keys = JWK::parseKeySet($this->signingKeysOnly($jwks), self::ALLOWED_ALGORITHM); - } catch (Throwable $e) { - throw new OidcTokenException("Unable to parse JWKS: {$e->getMessage()}", previous: $e); - } - - // Surface an unknown signing key distinctly so the caller can refresh - // the JWKS once (key rotation) before giving up. - if (! array_key_exists($kid, $keys)) { - throw new OidcSigningKeyNotFoundException('No matching JWKS key found for id_token kid.'); - } - - $previousLeeway = JWT::$leeway; - JWT::$leeway = $clockSkewSeconds; - - try { - // Validates signature, header alg against the key alg (RS256), - // exp, nbf and iat. Throws on any failure. - $claims = (array) JWT::decode($idToken, $keys); - } catch (OidcTokenException $e) { - throw $e; - } catch (Throwable $e) { - throw new OidcTokenException("id_token validation failed: {$e->getMessage()}", previous: $e); - } finally { - JWT::$leeway = $previousLeeway; - } - - $this->assertExpiry($claims); - $this->assertIssuer($claims, $discovery->issuer); - $this->assertAudience($claims, $clientId); - $this->assertNonce($claims, $expectedNonce); - $this->assertSubject($claims); - - return $claims; - } - - /** - * Drop JWKS entries explicitly marked for anything other than signing - * (e.g. "use":"enc") so they can never verify an id_token signature. - * firebase/php-jwt does not honour the "use" parameter on its own. - * - * @param array $jwks - * @return array - */ - private function signingKeysOnly(array $jwks): array - { - $keys = array_values(array_filter( - $jwks['keys'] ?? [], - fn ($jwk): bool => is_array($jwk) && (! isset($jwk['use']) || $jwk['use'] === 'sig'), - )); - - return ['keys' => $keys]; - } - - /** - * Decode just the JWT header to read the kid before signature - * verification, so an unknown key can be reported as a rotation miss. - */ - private function extractKid(string $idToken): string - { - $segments = explode('.', $idToken); - if (count($segments) !== 3) { - throw new OidcTokenException('Malformed id_token.'); - } - - $header = json_decode($this->base64UrlDecode($segments[0]), true); - if (! is_array($header)) { - throw new OidcTokenException('id_token header contains invalid JSON.'); - } - - if (($header['alg'] ?? null) !== self::ALLOWED_ALGORITHM) { - throw new OidcTokenException('id_token uses a disallowed algorithm.'); - } - - $kid = $header['kid'] ?? null; - if (! is_string($kid) || $kid === '') { - throw new OidcTokenException('id_token header is missing kid.'); - } - - return $kid; - } - - private function base64UrlDecode(string $value): string - { - $remainder = strlen($value) % 4; - if ($remainder !== 0) { - $value .= str_repeat('=', 4 - $remainder); - } - - $decoded = base64_decode(strtr($value, '-_', '+/'), true); - if ($decoded === false) { - throw new OidcTokenException('Invalid base64url value in id_token header.'); - } - - return $decoded; - } - - /** - * @param array $claims - */ - private function assertExpiry(array $claims): void - { - // Firebase enforces the exp window when present; OIDC requires it to exist. - if (! is_numeric($claims['exp'] ?? null)) { - throw new OidcTokenException('id_token is missing the exp claim.'); - } - } - - /** - * @param array $claims - */ - private function assertSubject(array $claims): void - { - $subject = $claims['sub'] ?? null; - if (! is_string($subject) || $subject === '') { - throw new OidcTokenException('id_token subject is missing or invalid.'); - } - } - - /** - * @param array $claims - */ - private function assertIssuer(array $claims, string $expectedIssuer): void - { - if (($claims['iss'] ?? null) !== $expectedIssuer) { - throw new OidcTokenException('id_token issuer does not match discovery issuer.'); - } - } - - /** - * @param array $claims - */ - private function assertAudience(array $claims, string $clientId): void - { - $audience = $claims['aud'] ?? null; - if (is_string($audience)) { - $audience = [$audience]; - } - - if (! is_array($audience) || ! in_array($clientId, $audience, true)) { - throw new OidcTokenException('id_token audience does not include configured client id.'); - } - - if (count($audience) > 1 && (! isset($claims['azp']) || $claims['azp'] !== $clientId)) { - throw new OidcTokenException('id_token azp is required when aud contains multiple values and must match configured client id.'); - } - - if (isset($claims['azp']) && $claims['azp'] !== $clientId) { - throw new OidcTokenException('id_token azp does not match configured client id.'); - } - } - - /** - * @param array $claims - */ - private function assertNonce(array $claims, ?string $expectedNonce): void - { - if ($expectedNonce === null) { - return; - } - - if (($claims['nonce'] ?? null) !== $expectedNonce) { - throw new OidcTokenException('id_token nonce does not match.'); - } - } -} diff --git a/app/Auth/Oidc/OidcUser.php b/app/Auth/Oidc/OidcUser.php deleted file mode 100644 index 645130e01..000000000 --- a/app/Auth/Oidc/OidcUser.php +++ /dev/null @@ -1,32 +0,0 @@ - - */ - public array $idTokenClaims = []; - - /** - * @param array $claims - */ - public function setIdTokenClaims(array $claims): self - { - $this->idTokenClaims = $claims; - $this->issuer = is_string($claims['iss'] ?? null) ? $claims['iss'] : null; - $this->subject = is_string($claims['sub'] ?? null) ? $claims['sub'] : null; - $this->emailVerified = ($claims['email_verified'] ?? false) === true; - - return $this; - } -} diff --git a/app/Auth/Oidc/Socialite/OidcProvider.php b/app/Auth/Oidc/Socialite/OidcProvider.php deleted file mode 100644 index 383b0cc91..000000000 --- a/app/Auth/Oidc/Socialite/OidcProvider.php +++ /dev/null @@ -1,299 +0,0 @@ - - */ - protected $scopes = ['openid', 'email', 'profile']; - - protected $scopeSeparator = ' '; - - protected ?OidcConfig $oidcConfig = null; - - protected ?OidcDiscoveryDocument $discovery = null; - - public function __construct( - Request $request, - protected OidcDiscoveryService $discoveryService, - protected OidcTokenValidator $tokenValidator, - string $clientId, - string $clientSecret, - string $redirectUrl, - ) { - parent::__construct($request, $clientId, $clientSecret, $redirectUrl); - } - - public function setConfig(OidcConfig $config): self - { - $this->oidcConfig = $config; - $this->clientId = $config->clientId; - $this->clientSecret = $config->clientSecret; - $this->redirectUrl = $config->redirectUri; - $this->scopes = $config->scopes; - $this->discovery = null; - - return $this; - } - - public function getConfig(): OidcConfig - { - if ($this->oidcConfig === null) { - throw new OidcException('OIDC provider config is not set.'); - } - - return $this->oidcConfig; - } - - protected function getAuthUrl($state): string - { - $config = $this->getConfig(); - $nonce = Str::random(40); - $this->putOidcFlowValue($this->nonceSessionKey($state), $nonce); - - $extra = ['nonce' => $nonce]; - if ($config->usePkce) { - $verifier = $this->generateCodeVerifier(); - $this->putOidcFlowValue($this->verifierSessionKey($state), $verifier); - $extra['code_challenge'] = $this->codeChallenge($verifier); - $extra['code_challenge_method'] = 'S256'; - } - - return $this->buildAuthUrlFromBase($this->resolveDiscovery()->authorizationEndpoint, $state) - .'&'.http_build_query($extra, '', '&', $this->encodingType); - } - - protected function getTokenUrl(): string - { - return $this->resolveDiscovery()->tokenEndpoint; - } - - /** - * @return array - */ - protected function getUserByToken($token): array - { - $response = $this->getHttpClient()->get($this->resolveDiscovery()->userinfoEndpoint, [ - RequestOptions::HEADERS => [ - 'Accept' => 'application/json', - 'Authorization' => 'Bearer '.$token, - ], - RequestOptions::CONNECT_TIMEOUT => 5, - RequestOptions::TIMEOUT => 10, - ]); - - $decoded = json_decode((string) $response->getBody(), true); - - return is_array($decoded) ? $decoded : []; - } - - /** - * @param array $user - */ - protected function mapUserToObject(array $user) - { - return (new OidcUser)->setRaw($user)->map([ - 'id' => $user['sub'] ?? null, - 'nickname' => $user['preferred_username'] ?? null, - 'name' => $this->resolveName($user), - 'email' => $user['email'] ?? null, - 'avatar' => $user['picture'] ?? null, - ]); - } - - public function user() - { - if ($this->user) { - return $this->user; - } - - if ($this->hasInvalidState()) { - throw new InvalidStateException; - } - - $tokenResponse = $this->getAccessTokenResponse($this->getCode()); - $accessToken = Arr::get($tokenResponse, 'access_token'); - $idToken = Arr::get($tokenResponse, 'id_token'); - - if (! is_string($accessToken) || $accessToken === '' || ! is_string($idToken) || $idToken === '') { - throw new OidcException('OIDC token endpoint did not return required tokens.'); - } - - $discovery = $this->resolveDiscovery(); - $config = $this->getConfig(); - $expectedNonce = $this->pullOidcFlowValue($this->nonceSessionKey((string) $this->request->input('state'))); - if ($expectedNonce === null) { - throw new OidcException('OIDC login session expired. Please try again.'); - } - - $claims = $this->validateIdToken($idToken, $discovery, $config, $expectedNonce); - - $userinfo = $this->getUserByToken($accessToken); - - // OIDC core §5.3.2: the userinfo sub MUST match the id_token sub. - // Reject the response rather than trust unsigned userinfo claims. - $userinfoSub = $userinfo['sub'] ?? null; - if (is_string($userinfoSub) && $userinfoSub !== '' && $userinfoSub !== ($claims['sub'] ?? null)) { - throw new OidcException('OIDC userinfo subject does not match the id_token subject.'); - } - - $merged = array_merge($userinfo, $claims); - - /** @var OidcUser $user */ - $user = $this->mapUserToObject($merged); - $user->setIdTokenClaims($claims) - ->setToken($accessToken) - ->setRefreshToken(Arr::get($tokenResponse, 'refresh_token')) - ->setExpiresIn(Arr::get($tokenResponse, 'expires_in')); - - return $this->user = $user; - } - - /** - * Validate the id_token, retrying once against a freshly fetched JWKS when - * the signing key is unknown. This keeps logins working immediately after - * the IdP rotates keys instead of failing until the JWKS cache expires. - * - * @return array - */ - protected function validateIdToken( - string $idToken, - OidcDiscoveryDocument $discovery, - OidcConfig $config, - ?string $expectedNonce, - ): array { - foreach ([false, true] as $forceRefresh) { - try { - return $this->tokenValidator->validate( - idToken: $idToken, - discovery: $discovery, - jwks: $this->discoveryService->jwks($discovery->jwksUri, $forceRefresh), - clientId: $config->clientId, - expectedNonce: $expectedNonce, - clockSkewSeconds: $config->clockSkewSeconds, - ); - } catch (OidcSigningKeyNotFoundException $e) { - if ($forceRefresh) { - throw $e; - } - } - } - - throw new OidcSigningKeyNotFoundException('No matching JWKS key found for id_token kid.'); - } - - /** - * @return array - */ - public function getAccessTokenResponse($code) - { - $fields = $this->getTokenFields($code); - if ($this->getConfig()->usePkce) { - $verifier = $this->pullOidcFlowValue($this->verifierSessionKey((string) $this->request->input('state'))); - if ($verifier === null) { - throw new OidcException('OIDC login session expired. Please try again.'); - } - - $fields['code_verifier'] = $verifier; - } - - $response = $this->getHttpClient()->post($this->getTokenUrl(), [ - RequestOptions::HEADERS => ['Accept' => 'application/json'], - RequestOptions::FORM_PARAMS => $fields, - RequestOptions::CONNECT_TIMEOUT => 5, - RequestOptions::TIMEOUT => 10, - ]); - - $decoded = json_decode((string) $response->getBody(), true); - - return is_array($decoded) ? $decoded : []; - } - - protected function resolveDiscovery(): OidcDiscoveryDocument - { - return $this->discovery ??= $this->discoveryService->discover($this->getConfig()->issuerUrl); - } - - protected function generateCodeVerifier(): string - { - return rtrim(strtr(base64_encode(random_bytes(64)), '+/', '-_'), '='); - } - - protected function codeChallenge(string $verifier): string - { - return rtrim(strtr(base64_encode(hash('sha256', $verifier, true)), '+/', '-_'), '='); - } - - /** - * @param array $user - */ - protected function resolveName(array $user): ?string - { - if (is_string($user['name'] ?? null) && $user['name'] !== '') { - return $user['name']; - } - - $name = trim(((string) ($user['given_name'] ?? '')).' '.((string) ($user['family_name'] ?? ''))); - - return $name === '' ? null : $name; - } - - protected function putOidcFlowValue(string $key, string $value): void - { - $this->request->session()->put($key, [ - 'value' => $value, - 'expires_at' => now()->addMinutes(self::OIDC_FLOW_TTL_MINUTES)->timestamp, - ]); - } - - protected function pullOidcFlowValue(string $key): ?string - { - $entry = $this->request->session()->pull($key); - - if (! is_array($entry)) { - return null; - } - - $value = $entry['value'] ?? null; - $expiresAt = $entry['expires_at'] ?? null; - - if (! is_string($value) || $value === '' || ! is_int($expiresAt)) { - return null; - } - - if ($expiresAt < now()->timestamp) { - return null; - } - - return $value; - } - - protected function nonceSessionKey(string $state): string - { - return "oidc.nonce.{$state}"; - } - - protected function verifierSessionKey(string $state): string - { - return "oidc.code_verifier.{$state}"; - } -} diff --git a/app/Helpers/SshMultiplexingHelper.php b/app/Helpers/SshMultiplexingHelper.php index e7d6d071b..cbb18945e 100644 --- a/app/Helpers/SshMultiplexingHelper.php +++ b/app/Helpers/SshMultiplexingHelper.php @@ -243,18 +243,12 @@ public static function generateSshCommand(Server $server, string $command, bool $delimiter = base64_encode(Hash::make($command)); $command = str_replace($delimiter, '', $command); - $remoteShellCommand = self::remoteShellCommand(); - return $sshCommand.self::escapedUserAtHost($server)." '{$remoteShellCommand}' << \\$delimiter".PHP_EOL + return $sshCommand.self::escapedUserAtHost($server)." 'bash -se' << \\$delimiter".PHP_EOL .$command.PHP_EOL .$delimiter; } - private static function remoteShellCommand(): string - { - return 'if command -v bash >/dev/null 2>&1; then exec bash -se; else exec sh -se; fi'; - } - public static function getConnectionTimeout(Server $server): int { $timeout = data_get($server, 'settings.connection_timeout'); diff --git a/app/Http/Controllers/OauthController.php b/app/Http/Controllers/OauthController.php index 93d27615a..4038fe63e 100644 --- a/app/Http/Controllers/OauthController.php +++ b/app/Http/Controllers/OauthController.php @@ -2,60 +2,47 @@ namespace App\Http\Controllers; -use App\Models\OauthSetting; -use App\Services\Auth\OauthLoginService; -use Illuminate\Support\Facades\Log; +use App\Models\User; +use Illuminate\Support\Facades\Auth; use Symfony\Component\HttpKernel\Exception\HttpException; class OauthController extends Controller { public function redirect(string $provider) { - $oauthSetting = $this->enabledProvider($provider); - $socialiteProvider = get_socialite_provider($oauthSetting->provider); + $socialite_provider = get_socialite_provider($provider); - return $socialiteProvider->redirect(); + return $socialite_provider->redirect(); } - public function callback(string $provider, OauthLoginService $oauthLoginService) + public function callback(string $provider) { try { - $oauthSetting = $this->enabledProvider($provider); - $oauthUser = get_socialite_provider($oauthSetting->provider)->user(); - $oauthLoginService->login($oauthSetting->provider, $oauthUser, $oauthSetting); + $oauthUser = get_socialite_provider($provider)->user(); + $email = trim((string) $oauthUser->email); + if ($email === '') { + abort(403, 'OAuth provider did not return an email address'); + } + $email = strtolower($email); + $user = User::whereEmail($email)->first(); + if (! $user) { + $settings = instanceSettings(); + if (! $settings->is_registration_enabled) { + abort(403, 'Registration is disabled'); + } + + $user = User::create([ + 'name' => $oauthUser->name, + 'email' => $email, + ]); + } + Auth::login($user); return redirect('/'); } catch (\Exception $e) { - $this->logCallbackFailure($provider, $e); - $errorCode = $e instanceof HttpException ? 'auth.failed' : 'auth.failed.callback'; return redirect()->route('login')->withErrors([__($errorCode)]); } } - - private function logCallbackFailure(string $provider, \Throwable $exception): void - { - Log::error('OAuth callback failed.', [ - 'provider' => $provider, - 'exception_class' => $exception::class, - 'exception_message' => $exception->getMessage(), - 'request_error' => request()->query('error'), - 'request_error_description' => request()->query('error_description'), - 'has_code' => request()->query->has('code'), - 'has_state' => request()->query->has('state'), - 'ip' => request()->ip(), - 'exception' => $exception, - ]); - } - - private function enabledProvider(string $provider): OauthSetting - { - $oauthSetting = OauthSetting::where('provider', $provider)->first(); - if (! $oauthSetting || ! $oauthSetting->enabled || ! $oauthSetting->couldBeEnabled()) { - throw new HttpException(403, 'OAuth provider is not enabled'); - } - - return $oauthSetting; - } } diff --git a/app/Livewire/Notifications/Discord.php b/app/Livewire/Notifications/Discord.php index 59ecb06e8..797db8362 100644 --- a/app/Livewire/Notifications/Discord.php +++ b/app/Livewire/Notifications/Discord.php @@ -166,30 +166,6 @@ public function instantSaveDiscordEnabled() } } - public function toggleDiscordEnabled(): void - { - try { - $this->resetErrorBag(); - - if ($this->discordEnabled) { - $this->discordEnabled = false; - } else { - $this->validate([ - 'discordWebhookUrl' => 'required', - ], [ - 'discordWebhookUrl.required' => 'Discord Webhook URL is required.', - ]); - $this->discordEnabled = true; - } - - $this->saveModel(); - } catch (\Throwable $e) { - $this->syncData(); - - handleError($e, $this); - } - } - public function instantSave() { try { diff --git a/app/Livewire/Notifications/Email.php b/app/Livewire/Notifications/Email.php index 2a373a506..3d95668b9 100644 --- a/app/Livewire/Notifications/Email.php +++ b/app/Livewire/Notifications/Email.php @@ -2,6 +2,7 @@ namespace App\Livewire\Notifications; +use App\Livewire\Notifications\Concerns\TogglesNotificationEvents; use App\Models\EmailNotificationSettings; use App\Models\Team; use App\Notifications\Test; @@ -14,7 +15,7 @@ class Email extends Component { - use AuthorizesRequests; + use AuthorizesRequests, TogglesNotificationEvents; protected $listeners = ['refresh' => '$refresh']; @@ -251,59 +252,32 @@ public function instantSave(?string $type = null) } } - public function toggleSmtp() - { - try { - $this->resetErrorBag(); - - if ($this->smtpEnabled) { - $this->smtpEnabled = false; - $this->saveModel(); - } else { - $this->validateSmtpSettings(); - $this->smtpEnabled = true; - $this->resendEnabled = false; - $this->submitSmtp(); - } - } catch (\Throwable $e) { - $this->syncData(); - - return handleError($e, $this); - } finally { - $this->dispatch('refresh'); - } - } - - public function toggleResend() - { - try { - $this->resetErrorBag(); - - if ($this->resendEnabled) { - $this->resendEnabled = false; - $this->saveModel(); - } else { - $this->validateResendSettings(); - $this->resendEnabled = true; - $this->smtpEnabled = false; - $this->submitResend(); - } - } catch (\Throwable $e) { - $this->syncData(); - - return handleError($e, $this); - } finally { - $this->dispatch('refresh'); - } - } - public function submitSmtp() { $this->authorize('update', $this->settings); try { $this->resetErrorBag(); - $this->validateSmtpSettings(); + $this->validate([ + 'smtpEnabled' => 'boolean', + 'smtpFromAddress' => 'required|email', + 'smtpFromName' => 'required|string', + 'smtpHost' => 'required|string', + 'smtpPort' => 'required|numeric', + 'smtpEncryption' => 'required|string|in:starttls,tls,none', + 'smtpUsername' => 'nullable|string', + 'smtpPassword' => 'nullable|string', + 'smtpTimeout' => 'nullable|numeric', + 'smtpEhloDomain' => ['nullable', 'string', new ValidHostname], + ], [ + 'smtpFromAddress.required' => 'From Address is required.', + 'smtpFromAddress.email' => 'Please enter a valid email address.', + 'smtpFromName.required' => 'From Name is required.', + 'smtpHost.required' => 'SMTP Host is required.', + 'smtpPort.required' => 'SMTP Port is required.', + 'smtpPort.numeric' => 'SMTP Port must be a number.', + 'smtpEncryption.required' => 'Encryption type is required.', + ]); if ($this->smtpEnabled) { $this->settings->resend_enabled = $this->resendEnabled = false; @@ -335,7 +309,17 @@ public function submitResend() try { $this->resetErrorBag(); - $this->validateResendSettings(); + $this->validate([ + 'resendEnabled' => 'boolean', + 'resendApiKey' => $this->resendEnabled ? 'required|string' : 'nullable|string', + 'smtpFromAddress' => 'required|email', + 'smtpFromName' => 'required|string', + ], [ + 'resendApiKey.required' => 'Resend API Key is required.', + 'smtpFromAddress.required' => 'From Address is required.', + 'smtpFromAddress.email' => 'Please enter a valid email address.', + 'smtpFromName.required' => 'From Name is required.', + ]); if ($this->resendEnabled) { $this->settings->smtp_enabled = $this->smtpEnabled = false; } @@ -352,45 +336,6 @@ public function submitResend() } } - private function validateSmtpSettings(): void - { - $this->validate([ - 'smtpEnabled' => 'boolean', - 'smtpFromAddress' => 'required|email', - 'smtpFromName' => 'required|string', - 'smtpHost' => 'required|string', - 'smtpPort' => 'required|numeric', - 'smtpEncryption' => 'required|string|in:starttls,tls,none', - 'smtpUsername' => 'nullable|string', - 'smtpPassword' => 'nullable|string', - 'smtpTimeout' => 'nullable|numeric', - 'smtpEhloDomain' => ['nullable', 'string', new ValidHostname], - ], [ - 'smtpFromAddress.required' => 'From Address is required.', - 'smtpFromAddress.email' => 'Please enter a valid email address.', - 'smtpFromName.required' => 'From Name is required.', - 'smtpHost.required' => 'SMTP Host is required.', - 'smtpPort.required' => 'SMTP Port is required.', - 'smtpPort.numeric' => 'SMTP Port must be a number.', - 'smtpEncryption.required' => 'Encryption type is required.', - ]); - } - - private function validateResendSettings(): void - { - $this->validate([ - 'resendEnabled' => 'boolean', - 'resendApiKey' => $this->resendEnabled ? 'required|string' : 'nullable|string', - 'smtpFromAddress' => 'required|email', - 'smtpFromName' => 'required|string', - ], [ - 'resendApiKey.required' => 'Resend API Key is required.', - 'smtpFromAddress.required' => 'From Address is required.', - 'smtpFromAddress.email' => 'Please enter a valid email address.', - 'smtpFromName.required' => 'From Name is required.', - ]); - } - public function sendTestEmail() { try { diff --git a/app/Livewire/Notifications/Pushover.php b/app/Livewire/Notifications/Pushover.php index b1608c5ea..3b7c3c6ae 100644 --- a/app/Livewire/Notifications/Pushover.php +++ b/app/Livewire/Notifications/Pushover.php @@ -159,34 +159,6 @@ public function instantSavePushoverEnabled() } } - public function togglePushoverEnabled() - { - try { - $this->resetErrorBag(); - - if ($this->pushoverEnabled) { - $this->pushoverEnabled = false; - } else { - $this->validate([ - 'pushoverUserKey' => 'required', - 'pushoverApiToken' => 'required', - ], [ - 'pushoverUserKey.required' => 'Pushover User Key is required.', - 'pushoverApiToken.required' => 'Pushover API Token is required.', - ]); - $this->pushoverEnabled = true; - } - - $this->saveModel(); - } catch (\Throwable $e) { - $this->syncData(); - - return handleError($e, $this); - } finally { - $this->dispatch('refresh'); - } - } - public function instantSave() { try { diff --git a/app/Livewire/Notifications/Slack.php b/app/Livewire/Notifications/Slack.php index c4ca7da80..9ee362402 100644 --- a/app/Livewire/Notifications/Slack.php +++ b/app/Livewire/Notifications/Slack.php @@ -150,32 +150,6 @@ public function instantSaveSlackEnabled() } } - public function toggleSlackEnabled() - { - try { - $this->resetErrorBag(); - - if ($this->slackEnabled) { - $this->slackEnabled = false; - } else { - $this->validate([ - 'slackWebhookUrl' => 'required', - ], [ - 'slackWebhookUrl.required' => 'Slack Webhook URL is required.', - ]); - $this->slackEnabled = true; - } - - $this->saveModel(); - } catch (\Throwable $e) { - $this->syncData(); - - return handleError($e, $this); - } finally { - $this->dispatch('refresh'); - } - } - public function instantSave() { try { diff --git a/app/Livewire/Notifications/Telegram.php b/app/Livewire/Notifications/Telegram.php index 9f19b22f5..b04d2c73d 100644 --- a/app/Livewire/Notifications/Telegram.php +++ b/app/Livewire/Notifications/Telegram.php @@ -252,34 +252,6 @@ public function instantSaveTelegramEnabled() } } - public function toggleTelegramEnabled(): void - { - try { - $this->resetErrorBag(); - - if ($this->telegramEnabled) { - $this->telegramEnabled = false; - } else { - $this->validate([ - 'telegramToken' => 'required', - 'telegramChatId' => 'required', - ], [ - 'telegramToken.required' => 'Telegram Token is required.', - 'telegramChatId.required' => 'Telegram Chat ID is required.', - ]); - $this->telegramEnabled = true; - } - - $this->saveModel(); - } catch (\Throwable $e) { - $this->syncData(); - - handleError($e, $this); - } finally { - $this->dispatch('refresh'); - } - } - public function saveModel() { $this->syncData(true); diff --git a/app/Livewire/Notifications/Webhook.php b/app/Livewire/Notifications/Webhook.php index ee0769476..fcf110778 100644 --- a/app/Livewire/Notifications/Webhook.php +++ b/app/Livewire/Notifications/Webhook.php @@ -144,30 +144,6 @@ public function instantSaveWebhookEnabled() } } - public function toggleWebhookEnabled() - { - try { - $this->resetErrorBag(); - - if ($this->webhookEnabled) { - $this->webhookEnabled = false; - } else { - $this->validate([ - 'webhookUrl' => 'required', - ], [ - 'webhookUrl.required' => 'Webhook URL is required.', - ]); - $this->webhookEnabled = true; - } - - $this->saveModel(); - } catch (\Throwable $e) { - $this->syncData(); - - return handleError($e, $this); - } - } - public function instantSave() { try { diff --git a/app/Livewire/Profile/Index.php b/app/Livewire/Profile/Index.php index ae5d9b3ec..a20a1231b 100644 --- a/app/Livewire/Profile/Index.php +++ b/app/Livewire/Profile/Index.php @@ -2,15 +2,19 @@ namespace App\Livewire\Profile; +use App\Services\AvatarStorageService; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\RateLimiter; use Illuminate\Validation\Rules\Password; use Livewire\Attributes\Validate; use Livewire\Component; +use Livewire\WithFileUploads; class Index extends Component { + use WithFileUploads; + public int $userId; public string $email; @@ -32,10 +36,6 @@ class Index extends Component public bool $show_verification = false; - public bool $uses_sso = false; - - public ?string $sso_provider_label = null; - public $avatar; public function uploadAvatar(AvatarStorageService $avatarStorage): bool @@ -75,12 +75,8 @@ public function mount() $this->name = Auth::user()->name; $this->email = Auth::user()->email; - $oauthIdentity = Auth::user()->oauthIdentities()->latest('id')->first(); - $this->uses_sso = $oauthIdentity !== null; - $this->sso_provider_label = $oauthIdentity ? $this->providerLabel($oauthIdentity->provider) : null; - // Check if there's a pending email change - if (! $this->uses_sso && Auth::user()->hasEmailChangeRequest()) { + if (Auth::user()->hasEmailChangeRequest()) { $this->new_email = Auth::user()->pending_email; $this->show_verification = true; } @@ -105,10 +101,6 @@ public function submit() public function requestEmailChange() { try { - if ($this->rejectSsoEmailChange()) { - return; - } - // For self-hosted, check if email is enabled if (! isCloud()) { $settings = instanceSettings(); @@ -167,10 +159,6 @@ public function requestEmailChange() public function verifyEmailChange() { try { - if ($this->rejectSsoEmailChange()) { - return; - } - $this->validate([ 'email_verification_code' => ['required', 'string', 'size:6'], ]); @@ -216,6 +204,7 @@ public function verifyEmailChange() $this->show_verification = false; $this->dispatch('success', 'Email address updated successfully.'); + $this->dispatch('close-email-change-modal'); } else { $this->dispatch('error', 'Failed to update email address.'); } @@ -227,10 +216,6 @@ public function verifyEmailChange() public function resendVerificationCode() { try { - if ($this->rejectSsoEmailChange()) { - return; - } - // Check if there's a pending request if (! Auth::user()->hasEmailChangeRequest()) { $this->dispatch('error', 'No pending email change request.'); @@ -284,30 +269,6 @@ public function cancelEmailChange() $this->dispatch('success', 'Email change request cancelled.'); } - public function showEmailChangeForm() - { - if ($this->rejectSsoEmailChange()) { - return; - } - - $this->show_email_change = true; - $this->new_email = ''; - } - - private function rejectSsoEmailChange(): bool - { - if (! Auth::user()->hasSsoIdentity()) { - return false; - } - - $this->uses_sso = true; - $this->show_email_change = false; - $this->show_verification = false; - $this->dispatch('error', 'Email addresses managed by SSO cannot be changed in Coolify.'); - - return true; - } - public function resetPassword() { try { @@ -338,14 +299,6 @@ public function resetPassword() } } - private function providerLabel(string $provider): string - { - return match ($provider) { - 'oidc' => 'OIDC', - default => str($provider)->headline()->toString(), - }; - } - public function render() { return view('livewire.profile.index'); diff --git a/app/Livewire/Security/IntegrationTokenEditor.php b/app/Livewire/Security/IntegrationTokenEditor.php deleted file mode 100644 index 453a7e8ae..000000000 --- a/app/Livewire/Security/IntegrationTokenEditor.php +++ /dev/null @@ -1,114 +0,0 @@ -integrationToken = IntegrationToken::ownedByCurrentTeam() - ->whereUuid($integration_token_uuid) - ->firstOrFail(); - - $this->authorize('view', $this->integrationToken); - - $this->name = $this->integrationToken->name; - $this->capabilities = $this->integrationToken->capabilities; - } - - protected function rules(): array - { - return [ - 'name' => ['required', 'string', 'max:255'], - 'newToken' => ['nullable', 'string'], - 'capabilities' => ['required', 'array', 'min:1'], - 'capabilities.*' => ['required', 'in:dns'], - ]; - } - - protected function messages(): array - { - return [ - 'capabilities.required' => 'Select at least one capability.', - 'capabilities.min' => 'Select at least one capability.', - ]; - } - - public function save(CloudflareTokenValidator $validator): void - { - $this->authorize('update', $this->integrationToken); - $validated = $this->validate(); - $token = filled($validated['newToken']) ? $validated['newToken'] : $this->integrationToken->token; - $capabilitiesChanged = collect($validated['capabilities'])->sort()->values()->all() - !== collect($this->integrationToken->capabilities)->sort()->values()->all(); - - try { - if ((filled($validated['newToken']) || $capabilitiesChanged) - && ! $validator->validate($token, $validated['capabilities'])) { - $this->dispatch('error', 'The token could not access the selected Cloudflare capabilities. Check its permissions and zone resources.'); - - return; - } - - $updates = [ - 'name' => $validated['name'], - 'capabilities' => $validated['capabilities'], - ]; - - if (filled($validated['newToken'])) { - $updates['token'] = $validated['newToken']; - } - - $this->integrationToken->update($updates); - $this->newToken = ''; - - auditLog('ui.integration_token.updated', [ - 'team_id' => currentTeam()->id, - 'integration_token_uuid' => $this->integrationToken->uuid, - 'integration_token_name' => $this->integrationToken->name, - 'provider' => $this->integrationToken->provider, - 'rotated' => array_key_exists('token', $updates), - ]); - - $this->dispatch( - 'integration-token-updated', - uuid: $this->integrationToken->uuid, - name: $this->integrationToken->name, - capabilities: $this->integrationToken->capabilities, - ); - $this->dispatch('success', 'Integration token updated successfully.'); - } catch (\Throwable $e) { - handleError($e, $this); - } - } - - public function delete(string $password = ''): void - { - $this->authorize('delete', $this->integrationToken); - $this->integrationToken->delete(); - - $this->dispatch('integration-token-deleted', uuid: $this->integrationToken->uuid); - $this->dispatch('close-modal'); - $this->dispatch('success', 'Integration token deleted successfully.'); - } - - public function render() - { - return view('livewire.security.integration-token-editor'); - } -} diff --git a/app/Livewire/Security/IntegrationTokenForm.php b/app/Livewire/Security/IntegrationTokenForm.php deleted file mode 100644 index 7a7637bf5..000000000 --- a/app/Livewire/Security/IntegrationTokenForm.php +++ /dev/null @@ -1,81 +0,0 @@ -authorize('create', IntegrationToken::class); - } - - protected function rules(): array - { - return [ - 'provider' => ['required', 'in:cloudflare'], - 'name' => ['required', 'string', 'max:255'], - 'token' => ['required', 'string'], - 'capabilities' => ['required', 'array', 'min:1'], - 'capabilities.*' => ['required', 'in:dns'], - ]; - } - - protected function messages(): array - { - return [ - 'capabilities.required' => 'Select at least one capability.', - 'capabilities.min' => 'Select at least one capability.', - ]; - } - - public function addToken(CloudflareTokenValidator $validator): void - { - $validated = $this->validate(); - - try { - if (! $validator->validate($validated['token'], $validated['capabilities'])) { - $this->dispatch('error', 'The token could not access the selected Cloudflare capabilities. Check its permissions and zone resources.'); - - return; - } - - IntegrationToken::query()->create([ - ...$validated, - 'team_id' => currentTeam()->id, - ]); - - $this->reset(['name', 'token']); - $this->dispatch('integrationTokenAdded')->to(IntegrationTokens::class); - - if ($this->modal_mode) { - $this->dispatch('close-modal'); - } - - $this->dispatch('success', 'Integration token added successfully.'); - } catch (\Throwable $e) { - handleError($e, $this); - } - } - - public function render() - { - return view('livewire.security.integration-token-form'); - } -} diff --git a/app/Livewire/Security/IntegrationTokens.php b/app/Livewire/Security/IntegrationTokens.php deleted file mode 100644 index 39db135b3..000000000 --- a/app/Livewire/Security/IntegrationTokens.php +++ /dev/null @@ -1,41 +0,0 @@ -authorize('viewAny', IntegrationToken::class); - $this->loadTokens(); - } - - #[On('integrationTokenAdded')] - public function loadTokens(): void - { - $this->tokens = IntegrationToken::ownedByCurrentTeam()->latest()->get(); - } - - public function deleteToken(int $tokenId, string $password = ''): void - { - $token = IntegrationToken::ownedByCurrentTeam()->findOrFail($tokenId); - $this->authorize('delete', $token); - $token->delete(); - $this->loadTokens(); - $this->dispatch('success', 'Integration token deleted successfully.'); - } - - public function render() - { - return view('livewire.security.integration-tokens'); - } -} diff --git a/app/Livewire/Server/LogDrains.php b/app/Livewire/Server/LogDrains.php index ae53488bd..3af0a2261 100644 --- a/app/Livewire/Server/LogDrains.php +++ b/app/Livewire/Server/LogDrains.php @@ -177,49 +177,6 @@ public function instantSave() } } - public function toggleLogDrain(string $type): void - { - $previousNewRelicEnabled = $this->server->settings->is_logdrain_newrelic_enabled; - $previousAxiomEnabled = $this->server->settings->is_logdrain_axiom_enabled; - $previousCustomEnabled = $this->server->settings->is_logdrain_custom_enabled; - - try { - $this->authorize('update', $this->server); - $this->resetErrorBag(); - - $enabledProperty = $this->enabledProperty($type); - - if ($this->{$enabledProperty}) { - $this->{$enabledProperty} = false; - } else { - $this->validateLogDrainSettings($type); - $this->isLogDrainNewRelicEnabled = $type === 'newrelic'; - $this->isLogDrainAxiomEnabled = $type === 'axiom'; - $this->isLogDrainCustomEnabled = $type === 'custom'; - } - - $this->syncData(true); - - if ($this->server->isLogDrainEnabled()) { - StartLogDrain::run($this->server); - $this->dispatch('success', 'Log drain service started.'); - } else { - StopLogDrain::run($this->server); - $this->dispatch('success', 'Log drain service stopped.'); - } - } catch (\Throwable $e) { - // Restore the previously persisted enabled flags so the UI/DB never - // claim a runtime state that the Start/StopLogDrain action failed to apply. - $this->server->settings->is_logdrain_newrelic_enabled = $previousNewRelicEnabled; - $this->server->settings->is_logdrain_axiom_enabled = $previousAxiomEnabled; - $this->server->settings->is_logdrain_custom_enabled = $previousCustomEnabled; - $this->server->settings->save(); - $this->syncData(); - - handleError($e, $this); - } - } - public function submit() { try { @@ -235,33 +192,4 @@ public function render() { return view('livewire.server.log-drains'); } - - private function enabledProperty(string $type): string - { - return match ($type) { - 'newrelic' => 'isLogDrainNewRelicEnabled', - 'axiom' => 'isLogDrainAxiomEnabled', - 'custom' => 'isLogDrainCustomEnabled', - default => throw new \InvalidArgumentException('Unknown log drain type.'), - }; - } - - private function validateLogDrainSettings(string $type): void - { - match ($type) { - 'newrelic' => $this->validate([ - 'logDrainNewRelicLicenseKey' => ['required', 'regex:/^[a-zA-Z0-9_\-\.]+$/'], - 'logDrainNewRelicBaseUri' => ['required', 'url'], - ]), - 'axiom' => $this->validate([ - 'logDrainAxiomDatasetName' => ['required', 'regex:/^[a-zA-Z0-9_\-\.]+$/'], - 'logDrainAxiomApiKey' => ['required', 'regex:/^[a-zA-Z0-9_\-\.]+$/'], - ]), - 'custom' => $this->validate([ - 'logDrainCustomConfig' => ['required'], - 'logDrainCustomConfigParser' => ['string', 'nullable'], - ]), - default => throw new \InvalidArgumentException('Unknown log drain type.'), - }; - } } diff --git a/app/Livewire/Settings/Advanced.php b/app/Livewire/Settings/Advanced.php index 38a2f85a7..fd5ee616d 100644 --- a/app/Livewire/Settings/Advanced.php +++ b/app/Livewire/Settings/Advanced.php @@ -19,9 +19,6 @@ class Advanced extends Component #[Validate('boolean')] public bool $is_registration_enabled; - #[Validate('boolean')] - public bool $disable_registration_when_oauth_enabled; - #[Validate('boolean')] public bool $do_not_track; @@ -62,7 +59,6 @@ public function rules() { return [ 'is_registration_enabled' => 'boolean', - 'disable_registration_when_oauth_enabled' => 'boolean', 'do_not_track' => 'boolean', 'is_dns_validation_enabled' => 'boolean', 'custom_dns_servers' => ['nullable', 'string', new ValidDnsServers], @@ -88,7 +84,6 @@ public function mount() $this->allowed_ips = $this->settings->allowed_ips; $this->do_not_track = $this->settings->do_not_track; $this->is_registration_enabled = $this->settings->is_registration_enabled; - $this->disable_registration_when_oauth_enabled = $this->settings->disable_registration_when_oauth_enabled; $this->is_dns_validation_enabled = $this->settings->is_dns_validation_enabled; $this->is_api_enabled = $this->settings->is_api_enabled; $this->disable_two_step_confirmation = $this->settings->disable_two_step_confirmation; @@ -204,7 +199,6 @@ public function instantSave(?array $webhookAllowedInternalHosts = null) try { $this->authorize('update', $this->settings); $this->settings->is_registration_enabled = $this->is_registration_enabled; - $this->settings->disable_registration_when_oauth_enabled = $this->disable_registration_when_oauth_enabled; $this->settings->do_not_track = $this->do_not_track; $this->settings->is_dns_validation_enabled = $this->is_dns_validation_enabled; $this->settings->custom_dns_servers = $this->custom_dns_servers; diff --git a/app/Livewire/SettingsEmail.php b/app/Livewire/SettingsEmail.php index 1426f61f0..9bca0db2e 100644 --- a/app/Livewire/SettingsEmail.php +++ b/app/Livewire/SettingsEmail.php @@ -160,59 +160,30 @@ public function instantSaveResend(): void $this->instantSave('Resend'); } - public function toggleSmtp() - { - try { - $this->resetErrorBag(); - - if ($this->smtpEnabled) { - $this->smtpEnabled = false; - $this->syncData(true); - $this->dispatch('success', 'SMTP settings updated.'); - } else { - $this->validateSmtpSettings(); - $this->smtpEnabled = true; - $this->resendEnabled = false; - $this->submitSmtp(); - } - } catch (\Throwable $e) { - $this->syncData(); - - return handleError($e, $this); - } - } - - public function toggleResend() - { - try { - $this->resetErrorBag(); - - if ($this->resendEnabled) { - $this->resendEnabled = false; - $this->syncData(true); - $this->dispatch('success', 'Resend settings updated.'); - } else { - $this->validateResendSettings(); - $this->resendEnabled = true; - $this->smtpEnabled = false; - $this->submitResend(); - } - } catch (\Throwable $e) { - $this->syncData(); - - return handleError($e, $this); - } - } - public function submitSmtp() { try { $this->authorize('update', $this->settings); - $this->validateSmtpSettings(); - - if ($this->smtpEnabled) { - $this->settings->resend_enabled = $this->resendEnabled = false; - } + $this->validate([ + 'smtpEnabled' => 'boolean', + 'smtpFromAddress' => 'required|email', + 'smtpFromName' => 'required|string', + 'smtpHost' => 'required|string', + 'smtpPort' => 'required|numeric', + 'smtpEncryption' => 'required|string|in:starttls,tls,none', + 'smtpUsername' => 'nullable|string', + 'smtpPassword' => 'nullable|string', + 'smtpTimeout' => 'nullable|numeric', + 'smtpEhloDomain' => ['nullable', 'string', new ValidHostname], + ], [ + 'smtpFromAddress.required' => 'From Address is required.', + 'smtpFromAddress.email' => 'Please enter a valid email address.', + 'smtpFromName.required' => 'From Name is required.', + 'smtpHost.required' => 'SMTP Host is required.', + 'smtpPort.required' => 'SMTP Port is required.', + 'smtpPort.numeric' => 'SMTP Port must be a number.', + 'smtpEncryption.required' => 'Encryption type is required.', + ]); $this->settings->smtp_enabled = $this->smtpEnabled; $this->settings->smtp_host = $this->smtpHost; @@ -239,11 +210,17 @@ public function submitResend() { try { $this->authorize('update', $this->settings); - $this->validateResendSettings(); - - if ($this->resendEnabled) { - $this->settings->smtp_enabled = $this->smtpEnabled = false; - } + $this->validate([ + 'resendEnabled' => 'boolean', + 'resendApiKey' => $this->resendEnabled ? 'required|string' : 'nullable|string', + 'smtpFromAddress' => 'required|email', + 'smtpFromName' => 'required|string', + ], [ + 'resendApiKey.required' => 'Resend API Key is required.', + 'smtpFromAddress.required' => 'From Address is required.', + 'smtpFromAddress.email' => 'Please enter a valid email address.', + 'smtpFromName.required' => 'From Name is required.', + ]); $this->settings->resend_enabled = $this->resendEnabled; $this->settings->resend_api_key = $this->resendApiKey; @@ -260,45 +237,6 @@ public function submitResend() } } - private function validateSmtpSettings(): void - { - $this->validate([ - 'smtpEnabled' => 'boolean', - 'smtpFromAddress' => 'required|email', - 'smtpFromName' => 'required|string', - 'smtpHost' => 'required|string', - 'smtpPort' => 'required|numeric', - 'smtpEncryption' => 'required|string|in:starttls,tls,none', - 'smtpUsername' => 'nullable|string', - 'smtpPassword' => 'nullable|string', - 'smtpTimeout' => 'nullable|numeric', - 'smtpEhloDomain' => ['nullable', 'string', new ValidHostname], - ], [ - 'smtpFromAddress.required' => 'From Address is required.', - 'smtpFromAddress.email' => 'Please enter a valid email address.', - 'smtpFromName.required' => 'From Name is required.', - 'smtpHost.required' => 'SMTP Host is required.', - 'smtpPort.required' => 'SMTP Port is required.', - 'smtpPort.numeric' => 'SMTP Port must be a number.', - 'smtpEncryption.required' => 'Encryption type is required.', - ]); - } - - private function validateResendSettings(): void - { - $this->validate([ - 'resendEnabled' => 'boolean', - 'resendApiKey' => $this->resendEnabled ? 'required|string' : 'nullable|string', - 'smtpFromAddress' => 'required|email', - 'smtpFromName' => 'required|string', - ], [ - 'resendApiKey.required' => 'Resend API Key is required.', - 'smtpFromAddress.required' => 'From Address is required.', - 'smtpFromAddress.email' => 'Please enter a valid email address.', - 'smtpFromName.required' => 'From Name is required.', - ]); - } - public function sendTestEmail() { try { diff --git a/app/Livewire/SettingsOauth.php b/app/Livewire/SettingsOauth.php index 3b24d0cd2..408271819 100644 --- a/app/Livewire/SettingsOauth.php +++ b/app/Livewire/SettingsOauth.php @@ -2,89 +2,53 @@ namespace App\Livewire; -use App\Models\InstanceSettings; use App\Models\OauthSetting; use Illuminate\Foundation\Auth\Access\AuthorizesRequests; -use Illuminate\Http\RedirectResponse; -use Illuminate\Validation\ValidationException; use Livewire\Component; class SettingsOauth extends Component { use AuthorizesRequests; - public InstanceSettings $settings; - public $oauth_settings_map; - public ?string $selectedProvider = null; - - public bool $disable_registration_when_oauth_enabled = false; - - protected function rules(): array + protected function rules() { - return $this->validationRules(); - } - - private function validationRules(?string $provider = null): array - { - $rules = OauthSetting::all()->reduce(function ($carry, $setting) use ($provider) { - if ($provider !== null && $setting->provider !== $provider) { - return $carry; - } - - $carry["oauth_settings_map.$setting->provider.enabled"] = 'required|boolean'; - $carry["oauth_settings_map.$setting->provider.client_id"] = 'nullable|string'; - $carry["oauth_settings_map.$setting->provider.client_secret"] = 'nullable|string'; - $carry["oauth_settings_map.$setting->provider.redirect_uri"] = 'nullable|string|max:2048|url:http,https'; - $carry["oauth_settings_map.$setting->provider.tenant"] = 'nullable|string'; - $carry["oauth_settings_map.$setting->provider.base_url"] = 'nullable|string|max:2048|url:http,https'; - $carry["oauth_settings_map.$setting->provider.custom_label"] = 'nullable|string|max:255'; - $carry["oauth_settings_map.$setting->provider.scopes"] = 'nullable|string|max:1000'; - $carry["oauth_settings_map.$setting->provider.allow_registration"] = 'boolean'; - $carry["oauth_settings_map.$setting->provider.auto_join_root_team"] = 'boolean'; - $carry["oauth_settings_map.$setting->provider.require_email_verified"] = 'boolean'; - $carry["oauth_settings_map.$setting->provider.use_pkce"] = 'boolean'; - $carry["oauth_settings_map.$setting->provider.clock_skew_seconds"] = 'nullable|integer|min:0|max:600'; + return OauthSetting::all()->reduce(function ($carry, $setting) { + $carry["oauth_settings_map.$setting->provider.enabled"] = 'required'; + $carry["oauth_settings_map.$setting->provider.client_id"] = 'nullable'; + $carry["oauth_settings_map.$setting->provider.client_secret"] = 'nullable'; + $carry["oauth_settings_map.$setting->provider.redirect_uri"] = 'nullable'; + $carry["oauth_settings_map.$setting->provider.tenant"] = 'nullable'; + $carry["oauth_settings_map.$setting->provider.base_url"] = 'nullable'; return $carry; }, []); - - if ($provider === null) { - $rules['disable_registration_when_oauth_enabled'] = 'boolean'; - } - - return $rules; } - public function mount(?string $provider = null): ?RedirectResponse + public function mount() { if (! isInstanceAdmin()) { return redirect()->route('home'); } + $this->oauth_settings_map = OauthSetting::all()->sortBy('provider')->reduce(function ($carry, $setting) { + $carry[$setting->provider] = [ + 'id' => $setting->id, + 'provider' => $setting->provider, + 'enabled' => $setting->enabled, + 'client_id' => $setting->client_id, + 'client_secret' => $setting->client_secret, + 'redirect_uri' => $setting->redirect_uri, + 'tenant' => $setting->tenant, + 'base_url' => $setting->base_url, + ]; - $this->settings = instanceSettings(); - $this->selectedProvider = $provider; - $this->disable_registration_when_oauth_enabled = (bool) $this->settings->disable_registration_when_oauth_enabled; - $this->oauth_settings_map = OauthSetting::all() - ->sortBy(fn (OauthSetting $setting): string => $setting->isOidc() ? '' : $setting->provider) - ->reduce(function ($carry, $setting) { - $carry[$setting->provider] = $this->oauthSettingToArray($setting); - - return $carry; - }, []); - - if ($this->selectedProvider !== null && ! array_key_exists($this->selectedProvider, $this->oauth_settings_map)) { - abort(404); - } - - return null; + return $carry; + }, []); } - private function updateOauthSettings(?string $provider = null): void + private function updateOauthSettings(?string $provider = null) { - $this->validate($this->validationRules($provider)); - if ($provider) { $oauthData = $this->oauth_settings_map[$provider]; $oauth = OauthSetting::find($oauthData['id']); @@ -93,128 +57,78 @@ private function updateOauthSettings(?string $provider = null): void throw new \Exception('OAuth setting for '.$provider.' not found. It may have been deleted.'); } - $this->fillOauthSetting($oauth, $oauthData); - $this->ensureProviderCanBeEnabled($oauth); + $oauth->fill([ + 'enabled' => $oauthData['enabled'], + 'client_id' => $oauthData['client_id'], + 'client_secret' => $oauthData['client_secret'], + 'redirect_uri' => $oauthData['redirect_uri'], + 'tenant' => $oauthData['tenant'], + 'base_url' => $oauthData['base_url'], + ]); + + if ($oauthData['enabled'] && ! $oauth->couldBeEnabled()) { + $oauth->update(['enabled' => false]); + throw new \Exception('OAuth settings are not complete for '.$oauth->provider.'.
Please fill in all required fields.'); + } $oauth->save(); - $this->oauth_settings_map[$provider] = $this->oauthSettingToArray($oauth); + // Update the array with fresh data + $this->oauth_settings_map[$provider] = [ + 'id' => $oauth->id, + 'provider' => $oauth->provider, + 'enabled' => $oauth->enabled, + 'client_id' => $oauth->client_id, + 'client_secret' => $oauth->client_secret, + 'redirect_uri' => $oauth->redirect_uri, + 'tenant' => $oauth->tenant, + 'base_url' => $oauth->base_url, + ]; $this->dispatch('success', 'OAuth settings for '.$oauth->provider.' updated successfully!'); + } else { + $errors = []; + foreach (array_values($this->oauth_settings_map) as $settingData) { + $oauth = OauthSetting::find($settingData['id']); - return; - } + if (! $oauth) { + $errors[] = "OAuth setting for provider '{$settingData['provider']}' not found. It may have been deleted."; - $errors = []; - foreach (array_values($this->oauth_settings_map) as $settingData) { - $oauth = OauthSetting::find($settingData['id']); + continue; + } - if (! $oauth) { - $errors[] = "OAuth setting for provider '{$settingData['provider']}' not found. It may have been deleted."; + $oauth->fill([ + 'enabled' => $settingData['enabled'], + 'client_id' => $settingData['client_id'], + 'client_secret' => $settingData['client_secret'], + 'redirect_uri' => $settingData['redirect_uri'], + 'tenant' => $settingData['tenant'], + 'base_url' => $settingData['base_url'], + ]); - continue; + if ($settingData['enabled'] && ! $oauth->couldBeEnabled()) { + $oauth->enabled = false; + $errors[] = "OAuth settings are incomplete for '{$oauth->provider}'. Required fields are missing. The provider has been disabled."; + } + + $oauth->save(); + + // Update the array with fresh data + $this->oauth_settings_map[$oauth->provider] = [ + 'id' => $oauth->id, + 'provider' => $oauth->provider, + 'enabled' => $oauth->enabled, + 'client_id' => $oauth->client_id, + 'client_secret' => $oauth->client_secret, + 'redirect_uri' => $oauth->redirect_uri, + 'tenant' => $oauth->tenant, + 'base_url' => $oauth->base_url, + ]; } - $this->fillOauthSetting($oauth, $settingData); - - if ($oauth->enabled && ! $oauth->couldBeEnabled()) { - $oauth->enabled = false; - $errors[] = "OAuth settings are incomplete for '{$oauth->provider}'. Required fields are missing. The provider has been disabled."; + if (! empty($errors)) { + $this->dispatch('error', implode('
', $errors)); } - - if ($oauth->enabled && $oauth->isOidc() && ! in_array('openid', $oauth->scopeList(), true)) { - $oauth->enabled = false; - $errors[] = "OIDC scopes must include 'openid'. The provider has been disabled."; - } - - $oauth->save(); - $this->oauth_settings_map[$oauth->provider] = $this->oauthSettingToArray($oauth); } - - instanceSettings()->update([ - 'disable_registration_when_oauth_enabled' => $this->disable_registration_when_oauth_enabled, - ]); - - if (! empty($errors)) { - $this->dispatch('error', implode('
', $errors)); - } - } - - private function fillOauthSetting(OauthSetting $oauth, array $data): void - { - $oauth->fill([ - 'enabled' => (bool) ($data['enabled'] ?? false), - 'client_id' => $data['client_id'] ?? null, - 'client_secret' => $data['client_secret'] ?? null, - 'redirect_uri' => $this->nullableString($data['redirect_uri'] ?? null), - 'tenant' => $data['tenant'] ?? null, - 'base_url' => $this->nullableString($data['base_url'] ?? null), - 'custom_label' => $data['custom_label'] ?? null, - 'scopes' => $data['scopes'] ?? null, - 'allow_registration' => (bool) ($data['allow_registration'] ?? false), - 'auto_join_root_team' => (bool) ($data['auto_join_root_team'] ?? false), - 'require_email_verified' => (bool) ($data['require_email_verified'] ?? true), - 'use_pkce' => (bool) ($data['use_pkce'] ?? true), - 'clock_skew_seconds' => (int) ($data['clock_skew_seconds'] ?? 60), - ]); - } - - private function nullableString(mixed $value): ?string - { - if ($value === null) { - return null; - } - - $value = trim((string) $value); - - return $value === '' ? null : $value; - } - - private function ensureProviderCanBeEnabled(OauthSetting $oauth): void - { - if (! $oauth->enabled) { - return; - } - - if (! $oauth->couldBeEnabled()) { - $oauth->update(['enabled' => false]); - throw new \Exception('OAuth settings are not complete for '.$oauth->provider.'.
Please fill in all required fields.'); - } - - if ($oauth->isOidc() && ! in_array('openid', $oauth->scopeList(), true)) { - $oauth->update(['enabled' => false]); - throw new \Exception("OIDC scopes must include 'openid'."); - } - } - - private function oauthSettingToArray(OauthSetting $setting): array - { - return [ - 'id' => $setting->id, - 'provider' => $setting->provider, - 'enabled' => $setting->enabled, - 'client_id' => $setting->client_id, - 'client_secret' => $setting->client_secret, - 'redirect_uri' => $setting->redirect_uri, - 'tenant' => $setting->tenant, - 'base_url' => $setting->base_url, - 'custom_label' => $setting->custom_label, - 'scopes' => $setting->scopes ?: 'openid email profile', - 'allow_registration' => $setting->allow_registration, - 'auto_join_root_team' => $setting->auto_join_root_team, - 'require_email_verified' => $setting->require_email_verified ?? true, - 'use_pkce' => $setting->use_pkce ?? true, - 'clock_skew_seconds' => $setting->clock_skew_seconds ?? 60, - 'label' => $this->providerLabel($setting->provider), - ]; - } - - public function providerLabel(string $provider): string - { - return match ($provider) { - 'oidc' => 'OpenID Connect', - 'gitlab' => 'GitLab', - default => str($provider)->headline()->toString(), - }; } public function instantSave(string $provider) @@ -227,88 +141,56 @@ public function instantSave(string $provider) } } - public function toggleProvider(string $provider) + public function toggleProvider(string $provider): mixed { try { $this->authorize('update', instanceSettings()); if (! array_key_exists($provider, $this->oauth_settings_map)) { - abort(404); + throw new \Exception('OAuth provider not found.'); } - if (! (bool) $this->oauth_settings_map[$provider]['enabled']) { - $this->validateProviderCanBeEnabled($provider); + $enabling = ! $this->oauth_settings_map[$provider]['enabled']; + if ($enabling) { + $this->validate($this->providerRules($provider)); } - $this->oauth_settings_map[$provider]['enabled'] = ! (bool) $this->oauth_settings_map[$provider]['enabled']; + $this->oauth_settings_map[$provider]['enabled'] = $enabling; $this->updateOauthSettings($provider); - } catch (\Exception $e) { - $oauth = OauthSetting::where('provider', $provider)->first(); - if ($oauth) { - $this->oauth_settings_map[$provider] = $this->oauthSettingToArray($oauth); - } - + } catch (\Throwable $e) { return handleError($e, $this); } + + return null; } - private function validateProviderCanBeEnabled(string $provider): void + private function providerRules(string $provider): array { - $this->validate($this->validationRules($provider)); + $prefix = "oauth_settings_map.$provider"; + $rules = [ + "$prefix.client_id" => 'required', + "$prefix.client_secret" => 'required', + ]; - $oauth = OauthSetting::find($this->oauth_settings_map[$provider]['id']); - if (! $oauth) { - throw new \Exception('OAuth setting for '.$provider.' not found. It may have been deleted.'); + if ($provider === 'azure') { + $rules["$prefix.tenant"] = 'required'; } - $this->fillOauthSetting($oauth, [ - ...$this->oauth_settings_map[$provider], - 'enabled' => true, - ]); - - if (! $oauth->couldBeEnabled()) { - throw new \Exception('OAuth settings are not complete for '.$oauth->provider.'.
Please fill in all required fields.'); + if (in_array($provider, ['authentik', 'clerk'], true)) { + $rules["$prefix.base_url"] = 'required'; } - if ($oauth->isOidc() && ! in_array('openid', $oauth->scopeList(), true)) { - throw new \Exception("OIDC scopes must include 'openid'."); - } + return $rules; } - public function saveRegistrationPolicy(): void - { - $this->authorize('update', instanceSettings()); - $this->validate([ - 'disable_registration_when_oauth_enabled' => 'boolean', - ]); - - instanceSettings()->update([ - 'disable_registration_when_oauth_enabled' => $this->disable_registration_when_oauth_enabled, - ]); - - $this->dispatch('success', 'Authentication settings updated successfully!'); - } - - public function submit(): void + public function submit() { try { $this->authorize('update', instanceSettings()); - $this->updateOauthSettings($this->selectedProvider); - - if ($this->selectedProvider === null) { - $this->dispatch('success', 'Instance settings updated successfully!'); - } - } catch (ValidationException $e) { - throw $e; - } catch (\Exception $e) { - if ($this->selectedProvider !== null) { - $oauth = OauthSetting::where('provider', $this->selectedProvider)->first(); - if ($oauth) { - $this->oauth_settings_map[$this->selectedProvider] = $this->oauthSettingToArray($oauth); - } - } - - handleError($e, $this); + $this->updateOauthSettings(); + $this->dispatch('success', 'Instance settings updated successfully!'); + } catch (\Throwable $e) { + return handleError($e, $this); } } } diff --git a/app/Models/InstanceSettings.php b/app/Models/InstanceSettings.php index 02f3e7ed5..eb01fa7ad 100644 --- a/app/Models/InstanceSettings.php +++ b/app/Models/InstanceSettings.php @@ -22,7 +22,6 @@ class InstanceSettings extends Model 'do_not_track', 'is_auto_update_enabled', 'is_registration_enabled', - 'disable_registration_when_oauth_enabled', 'next_channel', 'smtp_enabled', 'smtp_from_address', @@ -89,8 +88,6 @@ class InstanceSettings extends Model 'allowed_ip_ranges' => 'array', 'is_auto_update_enabled' => 'boolean', - 'is_registration_enabled' => 'boolean', - 'disable_registration_when_oauth_enabled' => 'boolean', 'auto_update_frequency' => 'string', 'update_check_frequency' => 'string', 'sentinel_token' => 'encrypted', @@ -118,19 +115,6 @@ protected static function booted(): void }); } - public function isPasswordRegistrationAllowed(): bool - { - if (! $this->is_registration_enabled) { - return false; - } - - if (! $this->disable_registration_when_oauth_enabled) { - return true; - } - - return ! OauthSetting::where('enabled', true)->exists(); - } - public function fqdn(): Attribute { return Attribute::make( diff --git a/app/Models/IntegrationToken.php b/app/Models/IntegrationToken.php deleted file mode 100644 index 20541f613..000000000 --- a/app/Models/IntegrationToken.php +++ /dev/null @@ -1,38 +0,0 @@ - 'encrypted', - 'capabilities' => 'array', - ]; - } - - public function team(): BelongsTo - { - return $this->belongsTo(Team::class); - } - - public static function ownedByCurrentTeam() - { - return self::query()->where('team_id', currentTeam()->id); - } -} diff --git a/app/Models/OauthIdentity.php b/app/Models/OauthIdentity.php deleted file mode 100644 index 1edf71ad2..000000000 --- a/app/Models/OauthIdentity.php +++ /dev/null @@ -1,35 +0,0 @@ - 'array', - 'last_login_at' => 'datetime', - ]; - } - - public function user(): BelongsTo - { - return $this->belongsTo(User::class); - } -} diff --git a/app/Models/OauthSetting.php b/app/Models/OauthSetting.php index 7765e4116..e7999134a 100644 --- a/app/Models/OauthSetting.php +++ b/app/Models/OauthSetting.php @@ -11,19 +11,7 @@ class OauthSetting extends Model { use HasFactory; - protected $fillable = ['provider', 'client_id', 'client_secret', 'redirect_uri', 'tenant', 'base_url', 'enabled', 'custom_label', 'scopes', 'allow_registration', 'auto_join_root_team', 'require_email_verified', 'use_pkce', 'clock_skew_seconds']; - - protected function casts(): array - { - return [ - 'enabled' => 'boolean', - 'allow_registration' => 'boolean', - 'auto_join_root_team' => 'boolean', - 'require_email_verified' => 'boolean', - 'use_pkce' => 'boolean', - 'clock_skew_seconds' => 'integer', - ]; - } + protected $fillable = ['provider', 'client_id', 'client_secret', 'redirect_uri', 'tenant', 'base_url', 'enabled']; protected $hidden = [ 'client_secret', @@ -44,46 +32,9 @@ public function couldBeEnabled(): bool return filled($this->client_id) && filled($this->client_secret) && filled($this->tenant); case 'authentik': case 'clerk': - case 'oidc': return filled($this->client_id) && filled($this->client_secret) && filled($this->base_url); default: return filled($this->client_id) && filled($this->client_secret); } } - - /** - * @return array - */ - public function scopeList(): array - { - $scopes = str($this->scopes ?: 'openid email profile') - ->replace(',', ' ') - ->explode(' ') - ->map(fn (string $scope) => trim($scope)) - ->filter() - ->unique() - ->values() - ->all(); - - return $scopes === [] ? ['openid', 'email', 'profile'] : $scopes; - } - - public function loginLabel(): string - { - if (filled($this->custom_label)) { - return $this->custom_label; - } - - $envLabel = config("services.{$this->provider}.custom_label"); - if (filled($envLabel)) { - return $envLabel; - } - - return __("auth.login.{$this->provider}"); - } - - public function isOidc(): bool - { - return $this->provider === 'oidc'; - } } diff --git a/app/Models/Team.php b/app/Models/Team.php index b7664e94d..15085203a 100644 --- a/app/Models/Team.php +++ b/app/Models/Team.php @@ -304,11 +304,6 @@ public function cloudProviderTokens() return $this->hasMany(CloudProviderToken::class); } - public function integrationTokens() - { - return $this->hasMany(IntegrationToken::class); - } - public function sources() { $sources = collect([]); diff --git a/app/Models/User.php b/app/Models/User.php index 10303422b..5b3847396 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -11,7 +11,6 @@ use App\Traits\DeletesUserSessions; use DateTimeInterface; use Illuminate\Database\Eloquent\Factories\HasFactory; -use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Notifications\Messages\MailMessage; use Illuminate\Notifications\Notifiable; @@ -508,26 +507,12 @@ public function hasEmailChangeRequest(): bool && Carbon::now()->lessThan($this->email_change_code_expires_at); } - public function oauthIdentities(): HasMany - { - return $this->hasMany(OauthIdentity::class); - } - - public function hasSsoIdentity(): bool - { - return $this->oauthIdentities()->exists(); - } - /** * Check if the user has a password set. + * OAuth users are created without passwords. */ public function hasPassword(): bool { return ! empty($this->password); } - - public function requiresPasswordConfirmation(): bool - { - return $this->hasPassword() && ! $this->hasSsoIdentity(); - } } diff --git a/app/Policies/IntegrationTokenPolicy.php b/app/Policies/IntegrationTokenPolicy.php deleted file mode 100644 index 309c8167f..000000000 --- a/app/Policies/IntegrationTokenPolicy.php +++ /dev/null @@ -1,34 +0,0 @@ -isAdmin(); - } - - public function create(User $user): bool - { - return $user->isAdmin(); - } - - public function view(User $user, IntegrationToken $integrationToken): bool - { - return $user->isAdmin() && $integrationToken->team_id === currentTeam()->id; - } - - public function update(User $user, IntegrationToken $integrationToken): bool - { - return $user->isAdmin() && $integrationToken->team_id === currentTeam()->id; - } - - public function delete(User $user, IntegrationToken $integrationToken): bool - { - return $user->isAdmin() && $integrationToken->team_id === currentTeam()->id; - } -} diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index e4d2b0a85..585679166 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -2,9 +2,6 @@ namespace App\Providers; -use App\Auth\Oidc\OidcDiscoveryService; -use App\Auth\Oidc\OidcTokenValidator; -use App\Auth\Oidc\Socialite\OidcProvider; use App\Models\PersonalAccessToken; use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\App; @@ -13,7 +10,6 @@ use Illuminate\Support\ServiceProvider; use Illuminate\Validation\Rules\Password; use Laravel\Sanctum\Sanctum; -use Laravel\Socialite\Contracts\Factory as SocialiteFactory; use Stripe\StripeClient; class AppServiceProvider extends ServiceProvider @@ -26,11 +22,12 @@ public function register(): void public function boot(): void { $this->configureCommands(); + $this->configureModels(); $this->configurePasswords(); $this->configureSanctumModel(); $this->configureGitHubHttp(); - $this->configureOidcSocialite(); + } private function configureCommands(): void @@ -65,24 +62,6 @@ private function configureSanctumModel(): void Sanctum::usePersonalAccessTokenModel(PersonalAccessToken::class); } - private function configureOidcSocialite(): void - { - if (! $this->app->bound(SocialiteFactory::class)) { - return; - } - - $this->app->make(SocialiteFactory::class)->extend('oidc', function ($app) { - return new OidcProvider( - $app['request'], - $app->make(OidcDiscoveryService::class), - $app->make(OidcTokenValidator::class), - '', - '', - '', - ); - }); - } - private function configureGitHubHttp(): void { Http::macro('GitHub', function (string $api_url, ?string $github_access_token = null) { @@ -98,5 +77,16 @@ private function configureGitHubHttp(): void ])->baseUrl($api_url); } }); + + Http::macro('GitLab', function (string $api_url, ?string $access_token = null) { + $client = Http::withHeaders([ + 'Accept' => 'application/json', + ])->baseUrl($api_url); + if ($access_token) { + $client = $client->withToken($access_token); + } + + return $client; + }); } } diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index e8e6fb42c..09b2a3e08 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -15,7 +15,6 @@ use App\Models\GithubApp; use App\Models\GitlabApp; use App\Models\InstanceSettings; -use App\Models\IntegrationToken; use App\Models\PrivateKey; use App\Models\Project; use App\Models\PushoverNotificationSettings; @@ -53,7 +52,6 @@ use App\Policies\GithubAppPolicy; use App\Policies\GitlabAppPolicy; use App\Policies\InstanceSettingsPolicy; -use App\Policies\IntegrationTokenPolicy; use App\Policies\NotificationPolicy; use App\Policies\PrivateKeyPolicy; use App\Policies\ProjectPolicy; @@ -134,7 +132,6 @@ class AuthServiceProvider extends ServiceProvider // Cloud provider policies CloudProviderToken::class => CloudProviderTokenPolicy::class, - IntegrationToken::class => IntegrationTokenPolicy::class, CloudInitScript::class => CloudInitScriptPolicy::class, Tag::class => TagPolicy::class, diff --git a/app/Providers/FortifyServiceProvider.php b/app/Providers/FortifyServiceProvider.php index bf6fa4c4b..1b201fb3f 100644 --- a/app/Providers/FortifyServiceProvider.php +++ b/app/Providers/FortifyServiceProvider.php @@ -48,7 +48,7 @@ public function boot(): void $isFirstUser = User::count() === 0; $settings = instanceSettings(); - if (! $settings->isPasswordRegistrationAllowed()) { + if (! $settings->is_registration_enabled) { return redirect()->route('login'); } @@ -61,13 +61,13 @@ public function boot(): void $settings = instanceSettings(); $enabled_oauth_providers = OauthSetting::where('enabled', true)->get(); $users = User::count(); - if ($users == 0 && $settings->isPasswordRegistrationAllowed()) { - // If there are no users and password registration is allowed, redirect to registration. + if ($users == 0) { + // If there are no users, redirect to registration return redirect()->route('register'); } return view('auth.login', [ - 'is_registration_enabled' => $settings->isPasswordRegistrationAllowed(), + 'is_registration_enabled' => $settings->is_registration_enabled, 'enabled_oauth_providers' => $enabled_oauth_providers, ]); }); diff --git a/app/Services/Auth/OauthLoginService.php b/app/Services/Auth/OauthLoginService.php deleted file mode 100644 index 2ec8f88e3..000000000 --- a/app/Services/Auth/OauthLoginService.php +++ /dev/null @@ -1,228 +0,0 @@ -email)); - if ($email === '' || ! filter_var($email, FILTER_VALIDATE_EMAIL)) { - throw new HttpException(403, 'OAuth provider did not return a valid email address'); - } - - $user = $provider === 'oidc' - ? $this->resolveOidcUser($oauthUser, $oauthSetting, $email) - : $this->resolveOauthUser($oauthUser, $oauthSetting, $email); - - Auth::login($user); - $team = $user->currentTeam() ?? $user->teams()->first() ?? $user->recreate_personal_team(); - session(['currentTeam' => $user->currentTeam = $team]); - - return $user; - } - - private function resolveOauthUser(object $oauthUser, OauthSetting $oauthSetting, string $email): User - { - $provider = $oauthSetting->provider; - $providerUserId = $oauthUser->id ?? null; - if ( - (! is_string($providerUserId) && ! is_int($providerUserId)) - || (is_string($providerUserId) && trim($providerUserId) === '') - ) { - throw new HttpException(403, 'OAuth provider did not return a valid user ID'); - } - $providerUserId = (string) $providerUserId; - $rawClaims = is_array($oauthUser->user ?? null) ? $oauthUser->user : []; - - $identityKey = [ - 'provider' => $provider, - 'issuer' => $provider, - 'provider_user_id' => $providerUserId, - ]; - - try { - return DB::transaction(function () use ($oauthUser, $oauthSetting, $email, $provider, $providerUserId, $rawClaims, $identityKey): User { - $identity = OauthIdentity::where($identityKey)->first(); - - if ($identity) { - $identity->update([ - 'email' => $email, - 'raw_claims' => $rawClaims, - 'last_login_at' => now(), - ]); - - return $identity->user; - } - - $user = User::whereEmail($email)->first(); - if (! $user) { - if (! $this->canCreateUser($oauthSetting)) { - throw new HttpException(403, 'Registration is disabled'); - } - - $user = $this->createUser($oauthUser->name ?: $email, $email, $oauthSetting); - } - - OauthIdentity::create([ - 'user_id' => $user->id, - 'provider' => $provider, - 'issuer' => $provider, - 'provider_user_id' => $providerUserId, - 'email' => $email, - 'raw_claims' => $rawClaims, - 'last_login_at' => now(), - ]); - - return $user; - }); - } catch (UniqueConstraintViolationException $exception) { - return OauthIdentity::where($identityKey)->first()?->user ?? throw $exception; - } - } - - private function resolveOidcUser(object $oauthUser, OauthSetting $oauthSetting, string $email): User - { - $issuer = $oauthUser instanceof OidcUser && filled($oauthUser->issuer) - ? $oauthUser->issuer - : data_get($oauthUser->user, 'iss'); - $subject = $oauthUser instanceof OidcUser && filled($oauthUser->subject) - ? $oauthUser->subject - : data_get($oauthUser->user, 'sub', $oauthUser->id); - $emailVerified = ($oauthUser instanceof OidcUser && $oauthUser->emailVerified) - || data_get($oauthUser->user, 'email_verified') === true; - - if (! is_string($issuer) || $issuer === '' || ! is_string($subject) || $subject === '') { - throw new HttpException(403, 'OIDC provider did not return issuer and subject claims'); - } - - if ($oauthSetting->require_email_verified && ! $emailVerified) { - throw new HttpException(403, 'OIDC provider did not verify the email address'); - } - - $rawClaims = is_array($oauthUser->user ?? null) ? $oauthUser->user : []; - - $identityKey = [ - 'provider' => 'oidc', - 'issuer' => $issuer, - 'provider_user_id' => $subject, - ]; - - try { - return DB::transaction(function () use ($oauthUser, $oauthSetting, $email, $issuer, $subject, $emailVerified, $rawClaims, $identityKey): User { - $identity = OauthIdentity::where($identityKey)->first(); - - if ($identity) { - $identity->update([ - 'email' => $email, - 'raw_claims' => $rawClaims, - 'last_login_at' => now(), - ]); - - return $identity->user; - } - - $user = User::whereEmail($email)->first(); - - // Linking a new OIDC identity to an existing local account by email - // is account takeover unless the provider attests the email. This - // guard is independent of the require_email_verified toggle, which - // only governs the broader login flow. - if ($user && ! $emailVerified) { - throw new HttpException(403, 'OIDC provider must verify the email address before linking to an existing account'); - } - - if (! $user) { - if (! $this->canCreateUser($oauthSetting)) { - throw new HttpException(403, 'Registration is disabled'); - } - - $user = $this->createUser($oauthUser->name ?: $email, $email, $oauthSetting); - } - - OauthIdentity::create([ - 'user_id' => $user->id, - 'provider' => 'oidc', - 'issuer' => $issuer, - 'provider_user_id' => $subject, - 'email' => $email, - 'raw_claims' => $rawClaims, - 'last_login_at' => now(), - ]); - - return $user; - }); - } catch (UniqueConstraintViolationException $exception) { - return OauthIdentity::where($identityKey)->first()?->user ?? throw $exception; - } - } - - private function canCreateUser(OauthSetting $oauthSetting): bool - { - return instanceSettings()->is_registration_enabled || $oauthSetting->allow_registration; - } - - private function createUser(string $name, string $email, OauthSetting $oauthSetting): User - { - if (User::count() === 0) { - $user = (new User)->forceFill([ - 'id' => 0, - 'name' => $name, - 'email' => $email, - 'password' => Hash::make(Str::random(64)), - ]); - $user->save(); - - $team = $user->teams()->first() ?? Team::find(0); - if ($team !== null && ! $user->teams()->where('team_id', $team->id)->exists()) { - $user->teams()->attach($team, ['role' => 'owner']); - } - - instanceSettings()->update(['is_registration_enabled' => false]); - - return $user; - } - - if ($oauthSetting->auto_join_root_team) { - return $this->createRootTeamOnlyUser($name, $email); - } - - return User::create([ - 'name' => $name, - 'email' => $email, - 'password' => Hash::make(Str::random(64)), - ]); - } - - private function createRootTeamOnlyUser(string $name, string $email): User - { - return DB::transaction(function () use ($name, $email) { - $rootTeam = Team::find(0); - if ($rootTeam === null) { - throw new HttpException(403, 'Root team is not available for OAuth user provisioning'); - } - - $user = User::withoutEvents(fn () => User::create([ - 'name' => $name, - 'email' => $email, - 'password' => Hash::make(Str::random(64)), - ])); - - $user->teams()->attach($rootTeam, ['role' => 'member']); - - return $user; - }); - } -} diff --git a/app/Services/CloudflareTokenValidator.php b/app/Services/CloudflareTokenValidator.php deleted file mode 100644 index 2a4a76102..000000000 --- a/app/Services/CloudflareTokenValidator.php +++ /dev/null @@ -1,42 +0,0 @@ -client($token); - $verification = $client->get('https://api.cloudflare.com/client/v4/user/tokens/verify'); - - if (! $verification->successful() || $verification->json('result.status') !== 'active') { - return false; - } - - if (in_array('dns', $capabilities, true)) { - $zones = $client->get('https://api.cloudflare.com/client/v4/zones', ['per_page' => 1]); - $zoneId = $zones->json('result.0.id'); - - if (! $zones->successful() || ! is_string($zoneId)) { - return false; - } - - return $client->get("https://api.cloudflare.com/client/v4/zones/{$zoneId}/dns_records", [ - 'per_page' => 1, - ])->successful(); - } - - return true; - } - - private function client(string $token): PendingRequest - { - return Http::withToken($token) - ->acceptJson() - ->connectTimeout(5) - ->timeout(10); - } -} diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php index 461e7c266..8a003ec40 100644 --- a/bootstrap/helpers/shared.php +++ b/bootstrap/helpers/shared.php @@ -4553,7 +4553,7 @@ function formatContainerStatus(string $status): string * Check if password confirmation should be skipped. * Returns true if: * - Two-step confirmation is globally disabled - * - User has no usable local password confirmation (including SSO users) + * - User has no password (OAuth users) * * Used by modal-confirmation.blade.php to determine if password step should be shown. * @@ -4566,9 +4566,8 @@ function shouldSkipPasswordConfirmation(): bool return true; } - // OAuth users may have an unusable generated password, so the linked - // identity is the source of truth for whether confirmation is possible. - if (! Auth::user()?->requiresPasswordConfirmation()) { + // Skip if user has no password (OAuth users) + if (! Auth::user()?->hasPassword()) { return true; } @@ -4579,7 +4578,7 @@ function shouldSkipPasswordConfirmation(): bool * Verify password for two-step confirmation. * Skips verification if: * - Two-step confirmation is globally disabled - * - User has no usable local password confirmation (including SSO users) + * - User has no password (OAuth users) * * @param mixed $password The password to verify (may be array if skipped by frontend) * @param Component|null $component Optional Livewire component to add errors to diff --git a/bootstrap/helpers/socialite.php b/bootstrap/helpers/socialite.php index f177e6c16..fd3fbe74b 100644 --- a/bootstrap/helpers/socialite.php +++ b/bootstrap/helpers/socialite.php @@ -1,13 +1,7 @@ client_id, $oauth_setting->client_secret, $oauth_setting->redirect_uri, @@ -29,7 +23,7 @@ function get_socialite_provider(string $provider) } if ($provider == 'authentik' || $provider == 'clerk') { - $authentik_clerk_config = new Config( + $authentik_clerk_config = new \SocialiteProviders\Manager\Config( $oauth_setting->client_id, $oauth_setting->client_secret, $oauth_setting->redirect_uri, @@ -40,7 +34,7 @@ function get_socialite_provider(string $provider) } if ($provider == 'zitadel') { - $zitadel_config = new Config( + $zitadel_config = new \SocialiteProviders\Manager\Config( $oauth_setting->client_id, $oauth_setting->client_secret, $oauth_setting->redirect_uri, @@ -50,12 +44,8 @@ function get_socialite_provider(string $provider) return Socialite::driver('zitadel')->setConfig($zitadel_config); } - if ($provider === 'oidc') { - return Socialite::driver('oidc')->setConfig(OidcConfig::fromOauthSetting($oauth_setting)); - } - if ($provider == 'google') { - $google_config = new Config( + $google_config = new \SocialiteProviders\Manager\Config( $oauth_setting->client_id, $oauth_setting->client_secret, $oauth_setting->redirect_uri @@ -73,11 +63,11 @@ function get_socialite_provider(string $provider) ]; $provider_class_map = [ - 'bitbucket' => BitbucketProvider::class, - 'discord' => Provider::class, - 'github' => GithubProvider::class, - 'gitlab' => GitlabProvider::class, - 'infomaniak' => SocialiteProviders\Infomaniak\Provider::class, + 'bitbucket' => \Laravel\Socialite\Two\BitbucketProvider::class, + 'discord' => \SocialiteProviders\Discord\Provider::class, + 'github' => \Laravel\Socialite\Two\GithubProvider::class, + 'gitlab' => \Laravel\Socialite\Two\GitlabProvider::class, + 'infomaniak' => \SocialiteProviders\Infomaniak\Provider::class, ]; $socialite = Socialite::buildProvider( diff --git a/composer.json b/composer.json index 18e125510..871c6f010 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,6 @@ "php": "^8.4", "danharrin/livewire-rate-limiting": "^2.2.1", "doctrine/dbal": "^4.4.4", - "firebase/php-jwt": "7.1.0", "guzzlehttp/guzzle": "^7.15.3", "laravel/fortify": "^1.37.3", "laravel/framework": "^12.65.0", diff --git a/composer.lock b/composer.lock index 18c5260f3..c2c42ba71 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2d511da9e5e82eade5aa7e5094c888ae", + "content-hash": "971daeb1b3078a36428c0fb56bb895b7", "packages": [ { "name": "aws/aws-crt-php", diff --git a/config/services.php b/config/services.php index 3a2a0631e..c5956cf6c 100644 --- a/config/services.php +++ b/config/services.php @@ -60,14 +60,6 @@ 'tenant' => env('GOOGLE_TENANT'), ], - 'oidc' => [ - 'client_id' => env('OIDC_CLIENT_ID'), - 'client_secret' => env('OIDC_CLIENT_SECRET'), - 'redirect' => env('OIDC_REDIRECT_URI'), - 'base_url' => env('OIDC_BASE_URL'), - 'custom_label' => env('OIDC_LOGIN_LABEL'), - ], - 'zitadel' => [ 'client_id' => env('ZITADEL_CLIENT_ID'), 'client_secret' => env('ZITADEL_CLIENT_SECRET'), diff --git a/database/migrations/2026_05_29_000000_encrypt_application_deployment_configuration_columns.php b/database/migrations/2026_05_29_000000_encrypt_application_deployment_configuration_columns.php index 13fe6b678..19c4445b2 100644 --- a/database/migrations/2026_05_29_000000_encrypt_application_deployment_configuration_columns.php +++ b/database/migrations/2026_05_29_000000_encrypt_application_deployment_configuration_columns.php @@ -8,12 +8,6 @@ /** * The configuration snapshot/diff now store an encrypted blob (not valid * JSON), so the columns must hold arbitrary text instead of json. - * - * Coolify's own backend runs exclusively on PostgreSQL in production and - * SQLite in testing (see config/database.php — the only configured - * connections are `pgsql` and `testing`). MySQL/MariaDB are user-managed - * resources, never Coolify's application database, so no driver path is - * needed for them here. */ public function up(): void { diff --git a/database/migrations/2026_06_04_091631_add_oidc_fields_to_oauth_settings_table.php b/database/migrations/2026_06_04_091631_add_oidc_fields_to_oauth_settings_table.php deleted file mode 100644 index 3160ef9dd..000000000 --- a/database/migrations/2026_06_04_091631_add_oidc_fields_to_oauth_settings_table.php +++ /dev/null @@ -1,40 +0,0 @@ -string('custom_label')->nullable(); - $table->string('scopes')->nullable(); - $table->boolean('allow_registration')->default(true); - $table->boolean('require_email_verified')->default(true); - $table->boolean('use_pkce')->default(true); - $table->unsignedSmallInteger('clock_skew_seconds')->default(60); - }); - } - - /** - * Reverse the migrations. - */ - public function down(): void - { - Schema::table('oauth_settings', function (Blueprint $table) { - $table->dropColumn([ - 'custom_label', - 'scopes', - 'allow_registration', - 'require_email_verified', - 'use_pkce', - 'clock_skew_seconds', - ]); - }); - } -}; diff --git a/database/migrations/2026_06_04_091631_create_oauth_identities_table.php b/database/migrations/2026_06_04_091631_create_oauth_identities_table.php deleted file mode 100644 index 9f838e577..000000000 --- a/database/migrations/2026_06_04_091631_create_oauth_identities_table.php +++ /dev/null @@ -1,36 +0,0 @@ -id(); - $table->foreignId('user_id')->constrained()->cascadeOnDelete(); - $table->string('provider'); - $table->string('issuer'); - $table->string('provider_user_id'); - $table->string('email')->nullable()->index(); - $table->json('raw_claims')->nullable(); - $table->timestamp('last_login_at')->nullable(); - $table->timestamps(); - - $table->unique(['provider', 'issuer', 'provider_user_id'], 'oauth_identity_provider_issuer_user_unique'); - }); - } - - /** - * Reverse the migrations. - */ - public function down(): void - { - Schema::dropIfExists('oauth_identities'); - } -}; diff --git a/database/migrations/2026_06_04_091632_add_oauth_registration_policy_to_instance_settings_table.php b/database/migrations/2026_06_04_091632_add_oauth_registration_policy_to_instance_settings_table.php deleted file mode 100644 index 06c0f1dd5..000000000 --- a/database/migrations/2026_06_04_091632_add_oauth_registration_policy_to_instance_settings_table.php +++ /dev/null @@ -1,28 +0,0 @@ -boolean('disable_registration_when_oauth_enabled')->default(false); - }); - } - - /** - * Reverse the migrations. - */ - public function down(): void - { - Schema::table('instance_settings', function (Blueprint $table) { - $table->dropColumn('disable_registration_when_oauth_enabled'); - }); - } -}; diff --git a/database/migrations/2026_06_23_151229_add_auto_join_root_team_to_oauth_settings_table.php b/database/migrations/2026_06_23_151229_add_auto_join_root_team_to_oauth_settings_table.php deleted file mode 100644 index b0f5aad18..000000000 --- a/database/migrations/2026_06_23_151229_add_auto_join_root_team_to_oauth_settings_table.php +++ /dev/null @@ -1,28 +0,0 @@ -boolean('auto_join_root_team')->default(false); - }); - } - - /** - * Reverse the migrations. - */ - public function down(): void - { - Schema::table('oauth_settings', function (Blueprint $table) { - $table->dropColumn('auto_join_root_team'); - }); - } -}; diff --git a/database/migrations/2026_08_15_000000_create_integration_tokens_table.php b/database/migrations/2026_08_15_000000_create_integration_tokens_table.php deleted file mode 100644 index a17d3972d..000000000 --- a/database/migrations/2026_08_15_000000_create_integration_tokens_table.php +++ /dev/null @@ -1,29 +0,0 @@ -id(); - $table->string('uuid')->unique(); - $table->foreignId('team_id')->constrained()->cascadeOnDelete(); - $table->string('provider'); - $table->string('name'); - $table->text('token'); - $table->json('capabilities'); - $table->timestamps(); - - $table->index(['team_id', 'provider']); - }); - } - - public function down(): void - { - Schema::dropIfExists('integration_tokens'); - } -}; diff --git a/database/seeders/OauthSettingSeeder.php b/database/seeders/OauthSettingSeeder.php index f916c4a9c..2e3e63def 100644 --- a/database/seeders/OauthSettingSeeder.php +++ b/database/seeders/OauthSettingSeeder.php @@ -23,7 +23,6 @@ public function run(): void 'github', 'gitlab', 'google', - 'oidc', 'authentik', 'infomaniak', 'zitadel', diff --git a/database/seeders/UserSeeder.php b/database/seeders/UserSeeder.php index 19d3aa42e..2ac615cc0 100644 --- a/database/seeders/UserSeeder.php +++ b/database/seeders/UserSeeder.php @@ -15,10 +15,12 @@ public function run(): void 'email' => 'test@example.com', ]); User::factory()->create([ + 'id' => 1, 'name' => 'Normal User (but in root team)', 'email' => 'test2@example.com', ]); User::factory()->create([ + 'id' => 2, 'name' => 'Normal User (not in root team)', 'email' => 'test3@example.com', ]); diff --git a/lang/de.json b/lang/de.json index cbc2237a7..7c43300e6 100644 --- a/lang/de.json +++ b/lang/de.json @@ -7,7 +7,6 @@ "auth.login.github": "Mit GitHub anmelden", "auth.login.gitlab": "Mit GitLab anmelden", "auth.login.google": "Mit Google anmelden", - "auth.login.oidc": "Mit SSO anmelden", "auth.login.infomaniak": "Mit Infomaniak anmelden", "auth.login.zitadel": "Mit Zitadel anmelden", "auth.already_registered": "Bereits registriert?", diff --git a/lang/en.json b/lang/en.json index b97a10d62..12c21b666 100644 --- a/lang/en.json +++ b/lang/en.json @@ -8,7 +8,6 @@ "auth.login.github": "Login with GitHub", "auth.login.gitlab": "Login with Gitlab", "auth.login.google": "Login with Google", - "auth.login.oidc": "Login with SSO", "auth.login.infomaniak": "Login with Infomaniak", "auth.login.zitadel": "Login with Zitadel", "auth.already_registered": "Already registered?", diff --git a/lang/pl.json b/lang/pl.json index b05437ac4..bcd8e2393 100644 --- a/lang/pl.json +++ b/lang/pl.json @@ -8,7 +8,6 @@ "auth.login.github": "Zaloguj się przez GitHub", "auth.login.gitlab": "Zaloguj się przez Gitlab", "auth.login.google": "Zaloguj się przez Google", - "auth.login.oidc": "Zaloguj się przez SSO", "auth.login.infomaniak": "Zaloguj się przez Infomaniak", "auth.login.zitadel": "Zaloguj się przez Zitadel", "auth.already_registered": "Już zarejestrowany?", diff --git a/public/svgs/oidc.svg b/public/svgs/oidc.svg deleted file mode 100644 index 9c542584e..000000000 --- a/public/svgs/oidc.svg +++ /dev/null @@ -1,5 +0,0 @@ - - OpenID Connect - - - diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 12eb57867..829a26cad 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -80,15 +80,11 @@ class="auth-tooltip max-w-xs whitespace-normal"> @if ($enabled_oauth_providers->isNotEmpty())
Or continue with
-
+
@foreach ($enabled_oauth_providers as $provider_setting) - @if ($provider_setting->provider !== 'oidc') - - @endif - {{ $provider_setting->loginLabel() }} + {{ __("auth.login.$provider_setting->provider") }} @endforeach
diff --git a/resources/views/components/security/settings-layout.blade.php b/resources/views/components/security/settings-layout.blade.php index a17b0b96a..d2b3e30a6 100644 --- a/resources/views/components/security/settings-layout.blade.php +++ b/resources/views/components/security/settings-layout.blade.php @@ -12,12 +12,6 @@ 'active' => request()->routeIs('security.cloud-tokens*'), 'icon' => 'cloud', ] : null, - auth()->user()?->can('viewAny', App\Models\IntegrationToken::class) ? [ - 'label' => 'Integration Tokens', - 'route' => 'security.integration-tokens', - 'active' => request()->routeIs('security.integration-tokens'), - 'icon' => 'network', - ] : null, auth()->user()?->can('viewAny', App\Models\CloudInitScript::class) ? [ 'label' => 'Cloud-Init Scripts', 'route' => 'security.cloud-init-scripts', diff --git a/resources/views/components/settings/sidebar.blade.php b/resources/views/components/settings/sidebar.blade.php index dbe381e05..0e0de551f 100644 --- a/resources/views/components/settings/sidebar.blade.php +++ b/resources/views/components/settings/sidebar.blade.php @@ -12,24 +12,6 @@ 'active' => $activeMenu === 'advanced', 'icon' => 'grid', ], - [ - 'label' => 'Authentication', - 'route' => 'settings.oauth', - 'active' => $activeMenu === 'oauth', - 'icon' => 'keys', - ], - [ - 'label' => 'Transactional Email', - 'route' => 'settings.email', - 'active' => $activeMenu === 'email', - 'icon' => 'notifications', - ], - [ - 'label' => 'Instance Backup', - 'route' => 'settings.backup', - 'active' => $activeMenu === 'backup', - 'icon' => 'database', - ], [ 'label' => 'Updates', 'route' => 'settings.updates', diff --git a/resources/views/livewire/profile/index.blade.php b/resources/views/livewire/profile/index.blade.php index 33f1b9a98..ef54d3e21 100644 --- a/resources/views/livewire/profile/index.blade.php +++ b/resources/views/livewire/profile/index.blade.php @@ -134,22 +134,15 @@ class="h-full w-full object-cover">
+ x-bind:disabled="emailModalOpen"> Change
- - + + - @if ($uses_sso) - - Signed in with SSO @if ($sso_provider_label) ({{ $sso_provider_label }}) @endif. Email is managed by your SSO provider. - - @endif - - @if (! $uses_sso) -
diff --git a/resources/views/livewire/security/integration-token-editor.blade.php b/resources/views/livewire/security/integration-token-editor.blade.php deleted file mode 100644 index b7e53dbc7..000000000 --- a/resources/views/livewire/security/integration-token-editor.blade.php +++ /dev/null @@ -1,52 +0,0 @@ -
- -
- - -
- -
-
- -
- Capabilities -
- -

- Manage Cloudflare DNS records. -

-
- @error('capabilities') - {{ $message }} - @enderror -
- - @if (in_array('dns', $capabilities, true)) -
-
Required Cloudflare permissions
-
    -
  • Zone - DNS - Edit
    • -
  • Zone - Zone - Read
    • -
- - Create a replacement token in Cloudflare - -
- @endif - -
- - - Validate and save - -
- -
diff --git a/resources/views/livewire/security/integration-token-form.blade.php b/resources/views/livewire/security/integration-token-form.blade.php deleted file mode 100644 index d847fff7f..000000000 --- a/resources/views/livewire/security/integration-token-form.blade.php +++ /dev/null @@ -1,49 +0,0 @@ -
-
- - -
- - -
- -
- Capabilities -
- -

- Manage Cloudflare DNS records. -

-
- @error('capabilities') - {{ $message }} - @enderror -
- - @if (in_array('dns', $capabilities, true)) -
-
Required Cloudflare permissions
-
    -
  • Zone - DNS - Edit
    • -
  • Zone - Zone - Read
    • -
-

Limit zone resources to the zones Coolify should manage.

- - Create this token in Cloudflare - -
- @endif - -
- - Validate and add - -
- -
diff --git a/resources/views/livewire/security/integration-tokens.blade.php b/resources/views/livewire/security/integration-tokens.blade.php deleted file mode 100644 index b4961551a..000000000 --- a/resources/views/livewire/security/integration-tokens.blade.php +++ /dev/null @@ -1,84 +0,0 @@ -
- - Integration Tokens | Coolify - - - -
- - - @can('create', App\Models\IntegrationToken::class) - - - - - - - @endcan - - - @if ($tokens->isEmpty()) - - @else -
- @foreach ($tokens as $savedToken) -
- - -
-
-

- -

-
-
- {{ ucfirst($savedToken->provider) }} -
-
- -
- -
- - - -
- @endforeach -
- @endif - -
- -
diff --git a/resources/views/livewire/server/security/patches.blade.php b/resources/views/livewire/server/security/patches.blade.php index f1e4fc3f7..d490b6f1d 100644 --- a/resources/views/livewire/server/security/patches.blade.php +++ b/resources/views/livewire/server/security/patches.blade.php @@ -35,8 +35,8 @@ class="server-settings-workspace application-settings-workspace mt-4 grid w-full - Automated package discovery currently supports apk, apt, dnf, pacman, and zypper. Weekly status - notifications can be managed from + Automated package discovery currently supports apt, dnf, and zypper. Weekly status notifications + can be managed from notification settings. diff --git a/resources/views/livewire/settings-oauth.blade.php b/resources/views/livewire/settings-oauth.blade.php index 822c035b3..97822b925 100644 --- a/resources/views/livewire/settings-oauth.blade.php +++ b/resources/views/livewire/settings-oauth.blade.php @@ -5,126 +5,76 @@ -
- -
+
+ +
-
+ @foreach ($oauth_settings_map as $oauth_setting) + @php + $provider = $oauth_setting['provider']; + $providerLabel = str($provider)->headline(); + @endphp - - - - - @foreach ($oauth_settings_map as $provider => $oauth_setting) + title="{{ $providerLabel }}">
- + if (!enabled) { + const invalidField = [...$el.closest('section').querySelectorAll('[required]')] + .find(field => !field.checkValidity()); + if (invalidField) { invalidField.reportValidity(); return; } + } + $wire.toggleProvider(provider); + "> {{ $oauth_setting['enabled'] ? 'Disable' : 'Enable' }}
-
- @if ($provider === 'oidc') - - - - - - -
- -
- @else - - - - @endif + + + + @if ($provider === 'azure') - + @endif @if ($provider === 'google') - @endif @if (in_array($provider, ['authentik', 'clerk', 'zitadel', 'gitlab'], true)) - + @endif - -
- -
- @if ($provider === 'oidc') - - - - @endif -
@endforeach diff --git a/resources/views/livewire/settings/advanced.blade.php b/resources/views/livewire/settings/advanced.blade.php index d05ac5ac9..d15a1b87a 100644 --- a/resources/views/livewire/settings/advanced.blade.php +++ b/resources/views/livewire/settings/advanced.blade.php @@ -13,19 +13,12 @@
- - + ]" /> create(); - $user = User::factory()->create(['email' => 'owner@example.com']); - $user->teams()->attach($team, ['role' => 'owner']); - - session(['currentTeam' => $team]); - test()->actingAs($user); - - return [$user, $team]; -} - -function actingAsEnableActionInstanceAdmin(): User -{ - $team = Team::forceCreate(['id' => 0, 'name' => 'Root Team', 'personal_team' => true]); - $user = User::factory()->create(['id' => 0, 'email' => 'root-enable-actions@example.com']); - if (! $user->teams()->whereKey($team->id)->exists()) { - $user->teams()->attach($team, ['role' => 'owner']); - } - - session(['currentTeam' => $team]); - test()->actingAs($user); - - return $user; -} - -beforeEach(function () { - InstanceSettings::forceCreate(['id' => 0]); - Once::flush(); -}); - -it('renders settings email enable actions instead of enabled checkboxes', function () { - $view = file_get_contents(resource_path('views/livewire/settings-email.blade.php')); - - expect($view)->toContain('Enable SMTP Server') - ->and($view)->toContain('Disable SMTP Server') - ->and($view)->toContain('Enable Resend') - ->and($view)->toContain('Disable Resend') - ->and($view)->not->toContain('id="smtpEnabled" label="Enabled"') - ->and($view)->not->toContain('id="resendEnabled" label="Enabled"'); -}); - -it('keeps transactional smtp disabled when enable validation fails', function () { - actingAsEnableActionInstanceAdmin(); - - Livewire::test(SettingsEmail::class) - ->call('toggleSmtp') - ->assertDispatched('error') - ->assertSet('smtpEnabled', false); - - expect(instanceSettings()->fresh()->smtp_enabled)->toBeFalse(); -}); - -it('enables transactional smtp only after required fields validate', function () { - actingAsEnableActionInstanceAdmin(); - - Livewire::test(SettingsEmail::class) - ->set('smtpFromAddress', 'mail@example.com') - ->set('smtpFromName', 'Coolify') - ->set('smtpHost', 'smtp.example.com') - ->set('smtpPort', '587') - ->set('smtpEncryption', 'starttls') - ->call('toggleSmtp') - ->assertHasNoErrors() - ->assertSet('smtpEnabled', true) - ->assertSet('resendEnabled', false); - - expect(instanceSettings()->fresh()->smtp_enabled)->toBeTrue() - ->and(instanceSettings()->fresh()->resend_enabled)->toBeFalse(); -}); - -it('renders notification provider enable actions instead of enabled checkboxes', function (string $view, string $enableLabel, string $checkboxSnippet) { - $contents = file_get_contents(resource_path("views/livewire/notifications/{$view}.blade.php")); - - expect($contents)->toContain($enableLabel) - ->and($contents)->not->toContain($checkboxSnippet); -})->with([ - 'discord' => ['discord', 'Enable Discord', 'id="discordEnabled" label="Enabled"'], - 'slack' => ['slack', 'Enable Slack', 'id="slackEnabled" label="Enabled"'], - 'telegram' => ['telegram', 'Enable Telegram', 'id="telegramEnabled" label="Enabled"'], - 'pushover' => ['pushover', 'Enable Pushover', 'id="pushoverEnabled" label="Enabled"'], - 'webhook' => ['webhook', 'Enable Webhook', 'id="webhookEnabled" label="Enabled"'], -]); - -it('shows notification provider save buttons while disabled', function (string $component) { - actingAsEnableActionOwner(); - - Livewire::test($component) - ->assertSet(str(class_basename($component))->camel()->append('Enabled')->toString(), false) - ->assertSee('Save'); -})->with([ - 'discord' => [Discord::class], - 'slack' => [Slack::class], - 'telegram' => [Telegram::class], - 'pushover' => [Pushover::class], - 'webhook' => [Webhook::class], -]); - -it('hides notification provider test buttons while disabled and shows them when enabled', function (string $component, string $enabledProperty) { - actingAsEnableActionOwner(); - - Livewire::test($component) - ->assertDontSee('Send Test Notification'); - - Livewire::test($component) - ->set($enabledProperty, true) - ->assertSee('Send Test Notification'); -})->with([ - 'discord' => [Discord::class, 'discordEnabled'], - 'slack' => [Slack::class, 'slackEnabled'], - 'telegram' => [Telegram::class, 'telegramEnabled'], - 'pushover' => [Pushover::class, 'pushoverEnabled'], - 'webhook' => [Webhook::class, 'webhookEnabled'], -]); - -it('hides the email test button while email notifications are disabled', function () { - actingAsEnableActionOwner(); - - Livewire::test(Email::class) - ->assertDontSee('Send Test Email'); -}); - -it('keeps notification providers disabled when enable validation fails', function (string $component, string $method, string $enabledProperty, string $requiredField, string $settingsRelation, string $settingsColumn) { - [, $team] = actingAsEnableActionOwner(); - - Livewire::test($component) - ->call($method) - ->assertDispatched('error') - ->assertSet($enabledProperty, false); - - expect($team->{$settingsRelation}->fresh()->{$settingsColumn})->toBeFalse(); -})->with([ - 'discord' => [Discord::class, 'toggleDiscordEnabled', 'discordEnabled', 'discordWebhookUrl', 'discordNotificationSettings', 'discord_enabled'], - 'slack' => [Slack::class, 'toggleSlackEnabled', 'slackEnabled', 'slackWebhookUrl', 'slackNotificationSettings', 'slack_enabled'], - 'telegram' => [Telegram::class, 'toggleTelegramEnabled', 'telegramEnabled', 'telegramToken', 'telegramNotificationSettings', 'telegram_enabled'], - 'pushover' => [Pushover::class, 'togglePushoverEnabled', 'pushoverEnabled', 'pushoverUserKey', 'pushoverNotificationSettings', 'pushover_enabled'], - 'webhook' => [Webhook::class, 'toggleWebhookEnabled', 'webhookEnabled', 'webhookUrl', 'webhookNotificationSettings', 'webhook_enabled'], -]); - -it('renders notification email and log drain enable actions instead of enabled checkboxes', function () { - $notificationEmail = file_get_contents(resource_path('views/livewire/notifications/email.blade.php')); - $logDrains = file_get_contents(resource_path('views/livewire/server/log-drains.blade.php')); - - expect($notificationEmail)->toContain('Enable SMTP Server') - ->and($notificationEmail)->toContain('Enable Resend') - ->and($notificationEmail)->not->toContain('id="smtpEnabled"') - ->and($notificationEmail)->not->toContain('id="resendEnabled"') - ->and($logDrains)->toContain('Enable New Relic') - ->and($logDrains)->toContain('Enable Axiom') - ->and($logDrains)->toContain('Enable Custom FluentBit') - ->and($logDrains)->not->toContain('label="Enabled"'); -}); - -it('keeps notification email smtp disabled when enable validation fails', function () { - actingAsEnableActionOwner(); - - Livewire::test(Email::class) - ->call('toggleSmtp') - ->assertDispatched('error') - ->assertSet('smtpEnabled', false); -}); diff --git a/tests/Feature/LogDrain/LogDrainToggleRollbackTest.php b/tests/Feature/LogDrain/LogDrainToggleRollbackTest.php deleted file mode 100644 index 994c96398..000000000 --- a/tests/Feature/LogDrain/LogDrainToggleRollbackTest.php +++ /dev/null @@ -1,45 +0,0 @@ -user = User::factory()->create(); - $this->team = $this->user->teams()->first(); - $this->server = Server::factory()->create(['team_id' => $this->team->id]); - - $this->actingAs($this->user); - session(['currentTeam' => $this->team]); -}); - -it('reverts the persisted enabled flag when starting the log drain fails', function () { - StartLogDrain::mock()->shouldReceive('handle')->andThrow(new RuntimeException('runtime boom')); - - expect($this->server->settings->fresh()->is_logdrain_newrelic_enabled)->toBeFalsy(); - - Livewire::test(LogDrains::class, ['server_uuid' => $this->server->uuid]) - ->set('logDrainNewRelicLicenseKey', 'abc123') - ->set('logDrainNewRelicBaseUri', 'https://log-api.newrelic.com') - ->call('toggleLogDrain', 'newrelic') - ->assertSet('isLogDrainNewRelicEnabled', false); - - expect($this->server->settings->fresh()->is_logdrain_newrelic_enabled)->toBeFalsy(); -}); - -it('keeps the enabled flag persisted when starting the log drain succeeds', function () { - StartLogDrain::mock()->shouldReceive('handle')->andReturn('ok'); - - Livewire::test(LogDrains::class, ['server_uuid' => $this->server->uuid]) - ->set('logDrainNewRelicLicenseKey', 'abc123') - ->set('logDrainNewRelicBaseUri', 'https://log-api.newrelic.com') - ->call('toggleLogDrain', 'newrelic') - ->assertSet('isLogDrainNewRelicEnabled', true); - - expect($this->server->settings->fresh()->is_logdrain_newrelic_enabled)->toBeTruthy(); -}); diff --git a/tests/Feature/LoginPageBrandingTest.php b/tests/Feature/LoginPageBrandingTest.php index ffe7da67c..5d60290ab 100644 --- a/tests/Feature/LoginPageBrandingTest.php +++ b/tests/Feature/LoginPageBrandingTest.php @@ -37,28 +37,6 @@ ->not->toMatch('/\.auth-shell\s*\{[^}]*color-mix\(in oklab, var\(--color-accent\) 9%, transparent\)/s'); }); -test('external login providers are centered and full width', function () { - $login = file_get_contents(resource_path('views/auth/login.blade.php')); - - expect($login) - ->toContain('class="flex flex-col gap-2"') - ->toContain('class="w-full justify-center"') - ->not->toContain('sm:w-[calc(50%-0.25rem)]'); -}); - -test('external login providers display their icons except oidc', function () { - $login = file_get_contents(resource_path('views/auth/login.blade.php')); - - expect($login) - ->toContain("@if (\$provider_setting->provider !== 'oidc')") - ->toContain("asset('svgs/'.\$provider_setting->provider.'.svg')") - ->toContain('class="size-5 shrink-0 dark:invert"'); - - foreach (['authentik', 'azure', 'bitbucket', 'clerk', 'discord', 'github', 'gitlab', 'google', 'infomaniak', 'zitadel'] as $provider) { - expect(public_path("svgs/{$provider}.svg"))->toBeFile(); - } -}); - test('error pages use the Coollabs purple background glow', function () { $styles = file_get_contents(resource_path('css/app.css')); diff --git a/tests/Feature/OauthControllerTest.php b/tests/Feature/OauthControllerTest.php index 4671183ae..1388e2980 100644 --- a/tests/Feature/OauthControllerTest.php +++ b/tests/Feature/OauthControllerTest.php @@ -1,35 +1,25 @@ 0, 'is_registration_enabled' => false, ]); - Once::flush(); - OauthSetting::create([ 'provider' => 'google', 'client_id' => 'client-id', 'client_secret' => 'client-secret', 'redirect_uri' => 'https://coolify.example.com/auth/google/callback', 'tenant' => 'example.com', - 'enabled' => true, ]); }); @@ -56,75 +46,6 @@ $response->assertRedirect('/'); $this->assertAuthenticatedAs($user); expect(User::count())->toBe(1); - expect(OauthIdentity::where([ - 'user_id' => $user->id, - 'provider' => 'google', - 'provider_user_id' => 'google-user-id', - ])->exists())->toBeTrue(); -}); - -it('never moves an existing oauth identity when the provider email changes', function () { - config()->set('app.maintenance.driver', 'file'); - - $identityOwner = User::factory()->create(['email' => 'old@example.com']); - $otherUser = User::factory()->create(['email' => 'new@example.com']); - $identity = OauthIdentity::create([ - 'user_id' => $identityOwner->id, - 'provider' => 'google', - 'issuer' => 'google', - 'provider_user_id' => 'google-user-id', - 'email' => 'old@example.com', - ]); - - $provider = Mockery::mock(); - $provider->shouldReceive('setConfig')->once()->andReturnSelf(); - $provider->shouldReceive('with')->once()->with(['hd' => 'example.com'])->andReturnSelf(); - $provider->shouldReceive('user')->once()->andReturn((object) [ - 'email' => 'new@example.com', - 'name' => 'Example User', - 'id' => 'google-user-id', - ]); - - Socialite::shouldReceive('driver')->once()->with('google')->andReturn($provider); - - $this->get(route('auth.callback', 'google'))->assertRedirect('/'); - - $this->assertAuthenticatedAs($identityOwner); - expect($identity->refresh()->user_id)->toBe($identityOwner->id) - ->and($identity->email)->toBe('new@example.com') - ->and($identity->user_id)->not->toBe($otherUser->id); -}); - -it('continues oauth login when another request creates the identity first', function () { - $user = User::factory()->create(['email' => 'race@example.com']); - $eventName = 'eloquent.creating: '.OauthIdentity::class; - - Event::listen($eventName, function (OauthIdentity $identity): void { - $attributes = $identity->getAttributes(); - - DB::afterRollBack(fn () => DB::table('oauth_identities')->insert($attributes)); - - throw new UniqueConstraintViolationException( - DB::getDefaultConnection(), - 'insert into oauth_identities', - [], - new PDOException('duplicate identity'), - ); - }); - - try { - $resolvedUser = app(OauthLoginService::class)->login('google', (object) [ - 'email' => 'race@example.com', - 'name' => 'Race User', - 'id' => 'google-race-id', - ], OauthSetting::where('provider', 'google')->firstOrFail()); - } finally { - Event::forget($eventName); - } - - expect($resolvedUser->is($user))->toBeTrue() - ->and(OauthIdentity::where('provider_user_id', 'google-race-id')->count())->toBe(1); - $this->assertAuthenticatedAs($user); }); it('rejects oauth logins when the provider does not return an email address', function (?string $providerEmail) { @@ -155,37 +76,4 @@ })->with([ 'null email' => [null], 'blank email' => [' '], - 'malformed email' => ['not-an-email'], - 'missing domain' => ['user@'], -]); - -it('rejects oauth logins when the provider does not return a valid user id', function (mixed $invalidId) { - $oauthUser = (object) [ - 'email' => 'user@example.edu', - 'name' => 'Example User', - ]; - - if ($invalidId !== 'missing') { - $oauthUser->id = $invalidId; - } - - try { - app(OauthLoginService::class)->login('google', $oauthUser, OauthSetting::where('provider', 'google')->firstOrFail()); - } catch (HttpException $exception) { - expect($exception->getStatusCode())->toBe(403) - ->and(OauthIdentity::count())->toBe(0) - ->and(User::count())->toBe(0); - - return; - } - - $this->fail('Expected an invalid OAuth provider user ID to be rejected.'); -})->with([ - 'null id' => [null], - 'missing id' => ['missing'], - 'blank id' => [' '], - 'non-scalar id' => [[]], - 'true id' => [true], - 'false id' => [false], - 'float id' => [1.0], ]); diff --git a/tests/Feature/OauthRegistrationPolicyTest.php b/tests/Feature/OauthRegistrationPolicyTest.php deleted file mode 100644 index 86186cca8..000000000 --- a/tests/Feature/OauthRegistrationPolicyTest.php +++ /dev/null @@ -1,52 +0,0 @@ - 0, - 'is_registration_enabled' => true, - 'disable_registration_when_oauth_enabled' => true, - ]); - Once::flush(); -}); - -it('blocks password registration when oauth registration policy disables it', function () { - OauthSetting::create([ - 'provider' => 'oidc', - 'enabled' => true, - 'client_id' => 'client-id', - 'client_secret' => 'secret', - 'base_url' => 'https://idp.example.com', - ]); - - app(CreateNewUser::class)->create([ - 'name' => 'Password User', - 'email' => 'password@example.com', - 'password' => 'password', - 'password_confirmation' => 'password', - ]); -})->throws(HttpException::class); - -it('allows password registration when no oauth provider is enabled', function () { - OauthSetting::create([ - 'provider' => 'oidc', - 'enabled' => false, - ]); - - $user = app(CreateNewUser::class)->create([ - 'name' => 'Password User', - 'email' => 'password@example.com', - 'password' => 'password', - 'password_confirmation' => 'password', - ]); - - expect($user->email)->toBe('password@example.com'); -}); diff --git a/tests/Feature/OidcOauthControllerTest.php b/tests/Feature/OidcOauthControllerTest.php deleted file mode 100644 index 084347f66..000000000 --- a/tests/Feature/OidcOauthControllerTest.php +++ /dev/null @@ -1,275 +0,0 @@ -set('app.maintenance.driver', 'file'); - - InstanceSettings::forceCreate([ - 'id' => 0, - 'is_registration_enabled' => false, - ]); - - Once::flush(); - - OauthSetting::create([ - 'provider' => 'oidc', - 'enabled' => true, - 'client_id' => 'client-id', - 'client_secret' => 'client-secret', - 'base_url' => 'https://idp.example.com', - 'redirect_uri' => 'https://coolify.example.com/auth/oidc/callback', - 'allow_registration' => false, - ]); -}); - -function fakeOidcProvider(array $claims = []): void -{ - $user = (new OidcUser)->setRaw(array_merge([ - 'iss' => 'https://idp.example.com', - 'sub' => 'okta-user-1', - 'email' => 'user@example.com', - 'email_verified' => true, - 'name' => 'Okta User', - ], $claims))->map([ - 'id' => $claims['sub'] ?? 'okta-user-1', - 'name' => $claims['name'] ?? 'Okta User', - 'email' => $claims['email'] ?? 'user@example.com', - ]); - - $provider = Mockery::mock(); - $provider->shouldReceive('setConfig')->andReturnSelf(); - $provider->shouldReceive('user')->andReturn($user); - - Socialite::shouldReceive('driver')->with('oidc')->andReturn($provider); -} - -it('logs in a user through an existing oidc identity', function () { - $user = User::factory()->create(['email' => 'existing@example.com']); - OauthIdentity::create([ - 'user_id' => $user->id, - 'provider' => 'oidc', - 'issuer' => 'https://idp.example.com', - 'provider_user_id' => 'okta-user-1', - 'email' => 'existing@example.com', - ]); - - fakeOidcProvider(['email' => 'existing@example.com']); - - $response = $this->get(route('auth.callback', 'oidc')); - - $response->assertRedirect('/'); - $this->assertAuthenticatedAs($user); -}); - -it('continues oidc login when another request creates the identity first', function () { - $user = User::factory()->create(['email' => 'race@example.com']); - $eventName = 'eloquent.creating: '.OauthIdentity::class; - - Event::listen($eventName, function (OauthIdentity $identity): void { - $attributes = $identity->getAttributes(); - - DB::afterRollBack(fn () => DB::table('oauth_identities')->insert($attributes)); - - throw new UniqueConstraintViolationException( - DB::getDefaultConnection(), - 'insert into oauth_identities', - [], - new PDOException('duplicate identity'), - ); - }); - - try { - $resolvedUser = app(OauthLoginService::class)->login('oidc', (new OidcUser)->setRaw([ - 'iss' => 'https://idp.example.com', - 'sub' => 'oidc-race-id', - 'email' => 'race@example.com', - 'email_verified' => true, - 'name' => 'Race User', - ])->map([ - 'id' => 'oidc-race-id', - 'name' => 'Race User', - 'email' => 'race@example.com', - ]), OauthSetting::where('provider', 'oidc')->firstOrFail()); - } finally { - Event::forget($eventName); - } - - expect($resolvedUser->is($user))->toBeTrue() - ->and(OauthIdentity::where('provider_user_id', 'oidc-race-id')->count())->toBe(1); - $this->assertAuthenticatedAs($user); -}); - -it('creates a new oidc user when provider registration is allowed while normal registration is disabled', function () { - OauthSetting::where('provider', 'oidc')->update(['allow_registration' => true]); - - fakeOidcProvider(['email' => 'newuser@example.com']); - - $response = $this->get(route('auth.callback', 'oidc')); - - $response->assertRedirect('/'); - $user = User::whereEmail('newuser@example.com')->first(); - expect($user)->not->toBeNull() - ->and($user->password)->not->toBeNull(); - $this->assertAuthenticatedAs($user); - $this->assertDatabaseHas('oauth_identities', [ - 'user_id' => $user->id, - 'provider' => 'oidc', - 'issuer' => 'https://idp.example.com', - 'provider_user_id' => 'okta-user-1', - ]); -}); - -it('creates a new oidc user in the root team only when provider root auto-join is enabled', function () { - Team::forceCreate(['id' => 0, 'name' => 'Root Team', 'personal_team' => true]); - (new User)->forceFill([ - 'id' => 0, - 'name' => 'Root User', - 'email' => 'root@example.com', - 'password' => 'password', - ])->save(); - - OauthSetting::where('provider', 'oidc')->update([ - 'allow_registration' => true, - 'auto_join_root_team' => true, - ]); - - fakeOidcProvider(['email' => 'root-member@example.com', 'name' => 'Root Member']); - - $response = $this->get(route('auth.callback', 'oidc')); - - $response->assertRedirect('/'); - $user = User::whereEmail('root-member@example.com')->first(); - expect($user)->not->toBeNull() - ->and($user->teams()->count())->toBe(1); - - $rootMembership = $user->teams()->where('teams.id', 0)->first(); - expect($rootMembership)->not->toBeNull() - ->and($rootMembership->pivot->role)->toBe('member'); - - $this->assertDatabaseMissing('teams', [ - 'name' => "Root Member's Team", - ]); - expect(session('currentTeam')->id)->toBe(0); - $this->assertAuthenticatedAs($user); -}); - -it('rejects linking an unverified oidc email to an existing local account', function () { - $user = User::factory()->create(['email' => 'victim@example.com']); - - fakeOidcProvider(['email' => 'victim@example.com', 'email_verified' => false]); - - $response = $this->from('/login')->get(route('auth.callback', 'oidc')); - - $response->assertRedirect('/login'); - $this->assertGuest(); - $this->assertDatabaseMissing('oauth_identities', [ - 'user_id' => $user->id, - 'provider' => 'oidc', - ]); -}); - -it('rejects new oidc users when neither normal nor provider registration is enabled', function () { - fakeOidcProvider(['email' => 'blocked@example.com']); - - $response = $this->from('/login')->get(route('auth.callback', 'oidc')); - - $response->assertRedirect('/login'); - expect(User::whereEmail('blocked@example.com')->exists())->toBeFalse(); -}); - -it('creates the root user when oidc provisions the first account', function () { - Team::forceCreate(['id' => 0, 'name' => 'Root Team', 'personal_team' => true]); - OauthSetting::where('provider', 'oidc')->update(['allow_registration' => true]); - - fakeOidcProvider(['email' => 'root@example.com', 'name' => 'Root User']); - - $response = $this->get(route('auth.callback', 'oidc')); - - $response->assertRedirect('/'); - $this->assertDatabaseHas('users', ['id' => 0, 'email' => 'root@example.com']); - $this->assertDatabaseHas('team_user', ['team_id' => 0, 'user_id' => 0, 'role' => 'owner']); - expect(InstanceSettings::find(0)->is_registration_enabled)->toBeFalse(); -}); - -it('persists raw claims as an array on the oauth identity', function () { - OauthSetting::where('provider', 'oidc')->update(['allow_registration' => true]); - - fakeOidcProvider(['email' => 'claims@example.com']); - - $this->get(route('auth.callback', 'oidc'))->assertRedirect('/'); - - $identity = OauthIdentity::where('email', 'claims@example.com')->first(); - expect($identity->raw_claims)->toBeArray() - ->and($identity->raw_claims['sub'])->toBe('okta-user-1'); -}); - -it('stores empty raw claims when the provider returns no user payload', function () { - OauthSetting::where('provider', 'oidc')->update(['allow_registration' => true]); - - $user = (new OidcUser)->setIdTokenClaims([ - 'iss' => 'https://idp.example.com', - 'sub' => 'okta-no-payload', - 'email_verified' => true, - ])->map([ - 'id' => 'okta-no-payload', - 'name' => 'No Payload', - 'email' => 'nopayload@example.com', - ]); - $user->user = null; - - $provider = Mockery::mock(); - $provider->shouldReceive('setConfig')->andReturnSelf(); - $provider->shouldReceive('user')->andReturn($user); - Socialite::shouldReceive('driver')->with('oidc')->andReturn($provider); - - $this->get(route('auth.callback', 'oidc'))->assertRedirect('/'); - - $identity = OauthIdentity::where('email', 'nopayload@example.com')->first(); - expect($identity->raw_claims)->toBe([]); -}); - -it('rejects callbacks for disabled oidc provider', function () { - OauthSetting::where('provider', 'oidc')->update(['enabled' => false]); - - $response = $this->from('/login')->get(route('auth.callback', 'oidc')); - - $response->assertRedirect('/login'); -}); - -it('logs callback failures with diagnostic context', function () { - Log::spy(); - - $provider = Mockery::mock(); - $provider->shouldReceive('setConfig')->andReturnSelf(); - $provider->shouldReceive('user')->andThrow(new RuntimeException('Token exchange failed')); - Socialite::shouldReceive('driver')->with('oidc')->andReturn($provider); - - $response = $this->from('/login')->get(route('auth.callback', ['provider' => 'oidc', 'code' => 'secret-code', 'state' => 'state-value'])); - - $response->assertRedirect('/login'); - Log::shouldHaveReceived('error')->once()->withArgs(function (string $message, array $context) { - return $message === 'OAuth callback failed.' - && $context['provider'] === 'oidc' - && $context['exception_class'] === RuntimeException::class - && $context['exception_message'] === 'Token exchange failed' - && $context['has_code'] === true - && $context['has_state'] === true - && $context['exception'] instanceof RuntimeException; - }); -}); diff --git a/tests/Feature/ProfileSsoIndicatorTest.php b/tests/Feature/ProfileSsoIndicatorTest.php deleted file mode 100644 index 0d48225eb..000000000 --- a/tests/Feature/ProfileSsoIndicatorTest.php +++ /dev/null @@ -1,91 +0,0 @@ -create(['name' => 'Profile User']); - - OauthIdentity::create([ - 'user_id' => $user->id, - 'provider' => 'oidc', - 'issuer' => 'https://idp.example.com', - 'provider_user_id' => 'idp-user-1', - 'email' => $user->email, - ]); - - $this->actingAs($user); - - Livewire::test(ProfileIndex::class) - ->assertSee('Signed in with SSO') - ->assertSee('OIDC'); -}); - -it('does not show sso status for password-only profile users', function () { - $user = User::factory()->create(['name' => 'Profile User']); - - $this->actingAs($user); - - Livewire::test(ProfileIndex::class) - ->assertDontSee('Signed in with SSO'); -}); - -it('prevents sso linked users from opening or requesting profile email changes', function () { - $user = User::factory()->create(['name' => 'SSO User', 'email' => 'sso@example.com']); - - OauthIdentity::create([ - 'user_id' => $user->id, - 'provider' => 'oidc', - 'issuer' => 'https://idp.example.com', - 'provider_user_id' => 'idp-user-1', - 'email' => $user->email, - ]); - - $this->actingAs($user); - - Livewire::test(ProfileIndex::class) - ->assertSee('Email is managed by your SSO provider.') - ->call('showEmailChangeForm') - ->assertSet('show_email_change', false) - ->assertDispatched('error') - ->set('new_email', 'changed@example.com') - ->call('requestEmailChange') - ->assertSet('show_email_change', false) - ->assertSet('show_verification', false) - ->assertDispatched('error'); - - $user->refresh(); - - expect($user->email)->toBe('sso@example.com') - ->and($user->pending_email)->toBeNull() - ->and($user->email_change_code)->toBeNull() - ->and($user->email_change_code_expires_at)->toBeNull(); -}); - -it('keeps profile email changes available for password-only users', function () { - config()->set('constants.coolify.self_hosted', false); - Notification::fake(); - - $user = User::factory()->create(['name' => 'Password User', 'email' => 'password@example.com']); - - $this->actingAs($user); - - Livewire::test(ProfileIndex::class) - ->call('showEmailChangeForm') - ->assertSet('show_email_change', true) - ->set('new_email', 'changed@example.com') - ->call('requestEmailChange') - ->assertSet('show_verification', true) - ->assertDispatched('success'); - - $user->refresh(); - - expect($user->pending_email)->toBe('changed@example.com') - ->and($user->email_change_code)->not->toBeNull(); -}); diff --git a/tests/Feature/Security/IntegrationTokenFormTest.php b/tests/Feature/Security/IntegrationTokenFormTest.php deleted file mode 100644 index 113fa4c03..000000000 --- a/tests/Feature/Security/IntegrationTokenFormTest.php +++ /dev/null @@ -1,253 +0,0 @@ -whereKey(0)->exists()) { - $settings = new InstanceSettings; - $settings->id = 0; - $settings->save(); - } - Once::flush(); - - $this->team = Team::factory()->create(); - $this->user = User::factory()->create(); - $this->team->members()->attach($this->user->id, ['role' => 'owner']); - - session(['currentTeam' => $this->team]); - $this->actingAs($this->user); -}); - -test('a cloudflare dns token is validated with read only requests before it is saved', function () { - Http::fake([ - 'https://api.cloudflare.com/client/v4/user/tokens/verify' => Http::response([ - 'success' => true, - 'result' => ['status' => 'active'], - ]), - 'https://api.cloudflare.com/client/v4/zones?per_page=1' => Http::response([ - 'success' => true, - 'result' => [['id' => 'zone-id']], - ]), - 'https://api.cloudflare.com/client/v4/zones/zone-id/dns_records?per_page=1' => Http::response([ - 'success' => true, - 'result' => [], - ]), - ]); - - Livewire::test(IntegrationTokenForm::class, ['modal_mode' => true]) - ->set('provider', 'cloudflare') - ->set('name', 'Production DNS') - ->set('token', 'cloudflare-token') - ->set('capabilities', ['dns']) - ->call('addToken') - ->assertHasNoErrors() - ->assertDispatched('close-modal'); - - $this->assertDatabaseHas('integration_tokens', [ - 'team_id' => $this->team->id, - 'provider' => 'cloudflare', - 'name' => 'Production DNS', - ]); - - Http::assertSentCount(3); - Http::assertSent(fn ($request) => $request->method() === 'GET' - && $request->url() === 'https://api.cloudflare.com/client/v4/zones/zone-id/dns_records?per_page=1'); -}); - -test('a cloudflare token is not saved when scope validation fails', function () { - Http::fake([ - 'https://api.cloudflare.com/client/v4/user/tokens/verify' => Http::response([ - 'success' => true, - 'result' => ['status' => 'active'], - ]), - 'https://api.cloudflare.com/client/v4/zones?per_page=1' => Http::response([ - 'success' => false, - 'errors' => [['message' => 'Authentication error']], - ], 403), - ]); - - Livewire::test(IntegrationTokenForm::class) - ->set('name', 'Invalid DNS token') - ->set('token', 'cloudflare-token') - ->set('capabilities', ['dns']) - ->call('addToken') - ->assertDispatched('error'); - - $this->assertDatabaseCount('integration_tokens', 0); -}); - -test('at least one capability is required when adding a cloudflare token', function () { - Livewire::test(IntegrationTokenForm::class) - ->set('name', 'Account token') - ->set('token', 'cloudflare-token') - ->set('capabilities', []) - ->call('addToken') - ->assertHasErrors(['capabilities' => 'required']); - - $this->assertDatabaseCount('integration_tokens', 0); - Http::assertNothingSent(); -}); - -test('integration tokens page lists saved provider and capabilities', function () { - IntegrationToken::query()->create([ - 'team_id' => $this->team->id, - 'provider' => 'cloudflare', - 'name' => 'Production DNS', - 'token' => 'secret', - 'capabilities' => ['dns'], - ]); - - Livewire::test(IntegrationTokens::class) - ->assertSee('Production DNS') - ->assertSee('Cloudflare') - ->assertSee('DNS'); -}); - -test('cloudflare dns scope guidance and token creation link are shown', function () { - Livewire::test(IntegrationTokenForm::class) - ->set('capabilities', ['dns']) - ->assertSee('Zone - DNS - Edit') - ->assertSee('Zone - Zone - Read') - ->assertSeeHtml('https://dash.cloudflare.com/profile/api-tokens?permissionGroupKeys=%5B%7B%22key%22%3A%22dns%22%2C%22type%22%3A%22edit%22%7D%5D&accountId=%2A&zoneId=all&name=Coolify%20DNS%20Management'); - - expect(file_get_contents(resource_path('views/livewire/security/integration-token-form.blade.php'))) - ->toContain('permissionGroupKeys=%5B%7B%22key%22%3A%22dns%22%2C%22type%22%3A%22edit%22%7D%5D'); -}); - -test('capability selection uses the shared checkbox component', function () { - $view = file_get_contents(resource_path('views/livewire/security/integration-token-form.blade.php')); - - expect($view) - ->toContain('toContain('class="mt-3 rounded-lg border') - ->not->toContain('toContain('wire:target="addToken" isHighlighted') - ->not->toContain('class="button-highlighted"'); -}); - -test('saved integration token rows render modal editors with a gear button', function () { - IntegrationToken::query()->create([ - 'team_id' => $this->team->id, - 'provider' => 'cloudflare', - 'name' => 'Production DNS', - 'token' => 'original-token', - 'capabilities' => ['dns'], - ]); - - Livewire::test(IntegrationTokens::class) - ->assertSee('Edit Integration Token') - ->assertSee('Production DNS') - ->assertSeeHtml(':aria-label="`Edit ${tokenName}`"'); -}); - -test('an integration token can be rotated after validating its capabilities', function () { - Http::fake([ - 'https://api.cloudflare.com/client/v4/user/tokens/verify' => Http::response([ - 'success' => true, - 'result' => ['status' => 'active'], - ]), - 'https://api.cloudflare.com/client/v4/zones?per_page=1' => Http::response([ - 'success' => true, - 'result' => [['id' => 'zone-id']], - ]), - 'https://api.cloudflare.com/client/v4/zones/zone-id/dns_records?per_page=1' => Http::response([ - 'success' => true, - 'result' => [], - ]), - ]); - - $savedToken = IntegrationToken::query()->create([ - 'team_id' => $this->team->id, - 'provider' => 'cloudflare', - 'name' => 'Production DNS', - 'token' => 'original-token', - 'capabilities' => ['dns'], - ]); - - Livewire::test(IntegrationTokenEditor::class, ['integration_token_uuid' => $savedToken->uuid]) - ->set('name', 'Rotated DNS') - ->set('newToken', 'rotated-token') - ->call('save') - ->assertHasNoErrors() - ->assertDispatched('success'); - - $savedToken->refresh(); - - expect($savedToken->name)->toBe('Rotated DNS') - ->and($savedToken->token)->toBe('rotated-token'); -}); - -test('leaving the token field blank keeps the existing integration token', function () { - Http::fake(); - - $savedToken = IntegrationToken::query()->create([ - 'team_id' => $this->team->id, - 'provider' => 'cloudflare', - 'name' => 'Production DNS', - 'token' => 'original-token', - 'capabilities' => ['dns'], - ]); - - Livewire::test(IntegrationTokenEditor::class, ['integration_token_uuid' => $savedToken->uuid]) - ->set('name', 'Renamed DNS') - ->set('newToken', '') - ->call('save') - ->assertHasNoErrors(); - - $savedToken->refresh(); - - expect($savedToken->name)->toBe('Renamed DNS') - ->and($savedToken->token)->toBe('original-token'); - - Http::assertNothingSent(); -}); - -test('an invalid replacement does not rotate the integration token', function () { - Http::fake([ - 'https://api.cloudflare.com/client/v4/user/tokens/verify' => Http::response([ - 'success' => false, - ], 403), - ]); - - $savedToken = IntegrationToken::query()->create([ - 'team_id' => $this->team->id, - 'provider' => 'cloudflare', - 'name' => 'Production DNS', - 'token' => 'original-token', - 'capabilities' => ['dns'], - ]); - - Livewire::test(IntegrationTokenEditor::class, ['integration_token_uuid' => $savedToken->uuid]) - ->set('newToken', 'invalid-token') - ->call('save') - ->assertDispatched('error'); - - expect($savedToken->fresh()->token)->toBe('original-token'); -}); - -test('editor updates its row without rerendering the teleported parent modal', function () { - $component = file_get_contents(app_path('Livewire/Security/IntegrationTokenEditor.php')); - - expect($component) - ->toContain("'integration-token-updated'") - ->toContain("'integration-token-deleted'") - ->not->toContain('integrationTokenChanged'); -}); diff --git a/tests/Feature/SecuritySettingsNavigationTest.php b/tests/Feature/SecuritySettingsNavigationTest.php index 9eab92cc2..e89bf8093 100644 --- a/tests/Feature/SecuritySettingsNavigationTest.php +++ b/tests/Feature/SecuritySettingsNavigationTest.php @@ -8,7 +8,6 @@ 'security/private-key/index.blade.php', 'security/private-key/show.blade.php', 'security/cloud-tokens.blade.php', - 'security/integration-tokens.blade.php', 'security/cloud-provider-token/show.blade.php', 'security/cloud-init-scripts.blade.php', 'security/cloud-init-script/show.blade.php', @@ -23,7 +22,6 @@ ->toContain('application-settings-navigation') ->toContain("'label' => 'Private Keys'") ->toContain("'label' => 'Cloud Tokens'") - ->toContain("'label' => 'Integration Tokens'") ->toContain("'label' => 'Cloud-Init Scripts'") ->toContain("'label' => 'API Tokens'"); diff --git a/tests/Feature/SettingsEmailProviderExclusivityTest.php b/tests/Feature/SettingsEmailProviderExclusivityTest.php deleted file mode 100644 index 7e6b6ff23..000000000 --- a/tests/Feature/SettingsEmailProviderExclusivityTest.php +++ /dev/null @@ -1,64 +0,0 @@ -settings = new InstanceSettings; - $this->settings->id = 0; - $this->settings->save(); - $this->rootTeam = Team::factory()->create(['id' => 0]); - $this->user = User::factory()->create(); - $this->user->teams()->attach($this->rootTeam, ['role' => 'owner']); - - $this->actingAs($this->user); - session(['currentTeam' => $this->rootTeam]); -}); - -test('enabling SMTP disables Resend in storage', function () { - $this->settings->update([ - 'resend_enabled' => true, - 'resend_api_key' => 're_test_key', - 'smtp_from_address' => 'from@example.com', - 'smtp_from_name' => 'Coolify', - ]); - - Livewire::test(SettingsEmail::class) - ->set('smtpHost', 'smtp.example.com') - ->set('smtpPort', '587') - ->set('smtpEncryption', 'starttls') - ->set('smtpFromAddress', 'from@example.com') - ->set('smtpFromName', 'Coolify') - ->call('toggleSmtp'); - - $this->settings->refresh(); - expect($this->settings->smtp_enabled)->toBeTrue(); - expect($this->settings->resend_enabled)->toBeFalse(); -}); - -test('enabling Resend disables SMTP in storage', function () { - $this->settings->update([ - 'smtp_enabled' => true, - 'smtp_host' => 'smtp.example.com', - 'smtp_port' => '587', - 'smtp_encryption' => 'starttls', - 'smtp_from_address' => 'from@example.com', - 'smtp_from_name' => 'Coolify', - ]); - - Livewire::test(SettingsEmail::class) - ->set('resendApiKey', 're_test_key') - ->set('smtpFromAddress', 'from@example.com') - ->set('smtpFromName', 'Coolify') - ->call('toggleResend'); - - $this->settings->refresh(); - expect($this->settings->resend_enabled)->toBeTrue(); - expect($this->settings->smtp_enabled)->toBeFalse(); -}); diff --git a/tests/Feature/SettingsNavigationTest.php b/tests/Feature/SettingsNavigationTest.php deleted file mode 100644 index 96b01d8d9..000000000 --- a/tests/Feature/SettingsNavigationTest.php +++ /dev/null @@ -1,52 +0,0 @@ -blade('') - ->assertSeeText('Configuration') - ->assertSeeText('OAuth') - ->assertSeeText('Scheduled Jobs') - ->assertDontSeeText('Instance Backup') - ->assertDontSeeText('Transactional Email'); -}); - -it('shows backup and transactional email in the settings configuration sidebar', function () { - $view = $this->blade('') - ->assertSeeTextInOrder([ - 'General', - 'Advanced', - 'Instance Backup', - 'Transactional Email', - 'Updates', - ]); - - expect((string) $view) - ->toContain(route('settings.backup')) - ->toContain(route('settings.email')) - ->and(substr_count((string) $view, 'menu-item-active'))->toBe(1); -}); - -it('renders backup and transactional email pages with the settings configuration sidebar', function () { - expect(file_get_contents(resource_path('views/livewire/settings-backup.blade.php'))) - ->toContain('') - ->and(file_get_contents(resource_path('views/livewire/settings-email.blade.php'))) - ->toContain(''); -}); - -it('uses the same title and description spacing on backup and transactional email settings pages', function () { - expect(file_get_contents(resource_path('views/livewire/settings-backup.blade.php'))) - ->not->toContain('class="flex items-center gap-2 pb-2"') - ->toContain('
Instance backup configuration for Coolify instance.
') - ->and(file_get_contents(resource_path('views/livewire/settings-email.blade.php'))) - ->not->toContain('class="flex flex-col gap-2 pb-4"') - ->toContain('
Instance wide email settings for password resets, invitations, etc.
'); -}); - -it('uses instance backup as the backup settings label', function () { - expect(file_get_contents(resource_path('views/components/settings/sidebar.blade.php'))) - ->toContain('Instance Backup') - ->not->toContain('Backup') - ->and(file_get_contents(resource_path('views/livewire/settings-backup.blade.php'))) - ->toContain('

Instance Backup

') - ->toContain('Instance backup configuration for Coolify instance.') - ->not->toContain('

Backup

'); -}); diff --git a/tests/Feature/SettingsOauthTest.php b/tests/Feature/SettingsOauthTest.php deleted file mode 100644 index 95ea47e94..000000000 --- a/tests/Feature/SettingsOauthTest.php +++ /dev/null @@ -1,277 +0,0 @@ - 0, 'name' => 'Root Team', 'personal_team' => true]); - $user = User::factory()->create(['id' => 0, 'email' => 'root@example.com', 'email_verified_at' => now()]); - if (! $user->teams()->whereKey($team->id)->exists()) { - $user->teams()->attach($team, ['role' => 'owner']); - } - session(['currentTeam' => $team]); - test()->actingAs($user); - - return $user; -} - -beforeEach(function () { - $this->withoutVite(); - config()->set('app.maintenance.driver', 'file'); - - InstanceSettings::forceCreate(['id' => 0, 'is_registration_enabled' => true]); - Once::flush(); - OauthSetting::create(['provider' => 'oidc']); - OauthSetting::create(['provider' => 'authentik']); - OauthSetting::create(['provider' => 'bitbucket']); -}); - -it('uses the standard settings design and keeps every oauth provider on one page', function () { - actingAsInstanceAdmin(); - - $this->withoutMiddleware(DecideWhatToDoWithUser::class) - ->get(route('settings.oauth')) - ->assertSuccessful() - ->assertSee('Authentication') - ->assertSee('Registration') - ->assertSee('Authentik') - ->assertSee('Bitbucket') - ->assertSee('OpenID Connect') - ->assertSee('Disable password registration when OAuth is enabled') - ->assertSee('Client secret') - ->assertSee('application-settings-form', false) - ->assertDontSee(route('settings.oauth.provider', 'authentik'), false); -}); - -it('lists openid connect before the other oauth providers', function () { - actingAsInstanceAdmin(); - - $providers = array_keys(Livewire::test(SettingsOauth::class)->get('oauth_settings_map')); - - expect($providers[0])->toBe('oidc'); -}); - -it('has an icon for openid connect', function () { - expect(public_path('svgs/oidc.svg'))->toBeFile(); -}); - -it('auto saves registration policy without a general save button', function () { - actingAsInstanceAdmin(); - - $this->withoutMiddleware(DecideWhatToDoWithUser::class) - ->get(route('settings.oauth')) - ->assertSuccessful() - ->assertSee("wire:click='saveRegistrationPolicy'", false) - ->assertDontSee('Save', false); - - Livewire::test(SettingsOauth::class) - ->set('disable_registration_when_oauth_enabled', true) - ->call('saveRegistrationPolicy') - ->assertHasNoErrors() - ->assertDispatched('success'); - - expect(instanceSettings()->fresh()->disable_registration_when_oauth_enabled)->toBeTrue(); -}); - -it('shows oidc fields with a naked okta issuer url example', function () { - actingAsInstanceAdmin(); - - $this->withoutMiddleware(DecideWhatToDoWithUser::class) - ->get(route('settings.oauth')) - ->assertSuccessful() - ->assertSee('OpenID Connect') - ->assertSee('https://example.okta.com', false) - ->assertDontSee('/oauth2/default', false); -}); - -it('groups oidc fields in the expected desktop order', function () { - $view = file_get_contents(resource_path('views/livewire/settings-oauth.blade.php')); - $fields = [ - 'redirect_uri', - 'base_url', - 'client_id', - 'client_secret', - 'scopes', - 'clock_skew_seconds', - 'custom_label', - ]; - $positions = array_map( - fn (string $field): int|false => strpos($view, "id=\"oauth_settings_map.{{ \$provider }}.$field\""), - $fields, - ); - - expect($positions)->not->toContain(false) - ->and($positions)->toBe(collect($positions)->sort()->values()->all()) - ->and($view)->toContain('
'); -}); - -it('shows provider enable controls as settings section actions', function () { - actingAsInstanceAdmin(); - - $this->withoutMiddleware(DecideWhatToDoWithUser::class) - ->get(route('settings.oauth')) - ->assertSuccessful() - ->assertSee('Enable') - ->assertDontSee('label="Enabled"', false) - ->assertDontSee('p-4 border dark:border-coolgray-300 border-neutral-200', false); -}); - -it('stacks oidc option checkboxes vertically', function () { - actingAsInstanceAdmin(); - - $this->withoutMiddleware(DecideWhatToDoWithUser::class) - ->get(route('settings.oauth')) - ->assertSuccessful() - ->assertSee('Allow OIDC user creation') - ->assertSee('Require verified email') - ->assertSee('Use PKCE') - ->assertDontSee('flex flex-col gap-2 pt-2 md:flex-row', false); -}); - -it('does not show unknown oauth providers', function () { - actingAsInstanceAdmin(); - - $this->withoutMiddleware(DecideWhatToDoWithUser::class) - ->get('/settings/oauth/unknown') - ->assertNotFound(); -}); - -it('defaults oidc user creation and verified email requirement to enabled', function () { - $setting = OauthSetting::where('provider', 'oidc')->first(); - - expect($setting->allow_registration)->toBeTrue() - ->and($setting->require_email_verified)->toBeTrue() - ->and($setting->auto_join_root_team)->toBeFalse(); -}); - -it('persists oidc oauth settings from livewire', function () { - actingAsInstanceAdmin(); - - Livewire::test(SettingsOauth::class) - ->set('oauth_settings_map.oidc.enabled', true) - ->set('oauth_settings_map.oidc.client_id', 'client-id') - ->set('oauth_settings_map.oidc.client_secret', 'secret') - ->set('oauth_settings_map.oidc.redirect_uri', 'https://coolify.example.com/auth/oidc/callback') - ->set('oauth_settings_map.oidc.base_url', 'https://idp.example.com') - ->set('oauth_settings_map.oidc.scopes', 'openid email profile groups') - ->set('oauth_settings_map.oidc.custom_label', 'Login with Okta') - ->set('oauth_settings_map.oidc.allow_registration', true) - ->set('oauth_settings_map.oidc.auto_join_root_team', true) - ->set('oauth_settings_map.oidc.require_email_verified', true) - ->set('disable_registration_when_oauth_enabled', true) - ->call('submit') - ->assertHasNoErrors(); - - $setting = OauthSetting::where('provider', 'oidc')->first(); - expect($setting->enabled)->toBeTrue() - ->and($setting->redirect_uri)->toBe('https://coolify.example.com/auth/oidc/callback') - ->and($setting->base_url)->toBe('https://idp.example.com') - ->and($setting->custom_label)->toBe('Login with Okta') - ->and($setting->scopeList())->toBe(['openid', 'email', 'profile', 'groups']) - ->and($setting->allow_registration)->toBeTrue() - ->and($setting->auto_join_root_team)->toBeTrue(); - - expect(instanceSettings()->fresh()->disable_registration_when_oauth_enabled)->toBeTrue(); -}); - -it('saves only the selected provider from provider pages', function () { - actingAsInstanceAdmin(); - - Livewire::test(SettingsOauth::class, ['provider' => 'authentik']) - ->set('oauth_settings_map.oidc.redirect_uri', 'not-a-url') - ->set('oauth_settings_map.authentik.enabled', true) - ->set('oauth_settings_map.authentik.client_id', 'authentik-client') - ->set('oauth_settings_map.authentik.client_secret', 'authentik-secret') - ->set('oauth_settings_map.authentik.base_url', 'https://authentik.example.com') - ->call('submit') - ->assertHasNoErrors(); - - $setting = OauthSetting::where('provider', 'authentik')->first(); - expect($setting->enabled)->toBeTrue() - ->and($setting->client_id)->toBe('authentik-client') - ->and($setting->base_url)->toBe('https://authentik.example.com'); -}); - -it('validates oidc url fields before saving', function (string $field, string $value) { - actingAsInstanceAdmin(); - - Livewire::test(SettingsOauth::class) - ->set('oauth_settings_map.oidc.client_id', 'client-id') - ->set('oauth_settings_map.oidc.client_secret', 'secret') - ->set('oauth_settings_map.oidc.base_url', 'https://idp.example.com') - ->set("oauth_settings_map.oidc.$field", $value) - ->call('submit') - ->assertHasErrors(["oauth_settings_map.oidc.$field" => 'url']); - - $setting = OauthSetting::where('provider', 'oidc')->first(); - expect($setting->{$field})->toBeNull(); -})->with([ - 'invalid redirect uri' => ['redirect_uri', 'not-a-url'], - 'non-http redirect uri' => ['redirect_uri', 'javascript:alert(1)'], - 'invalid issuer url' => ['base_url', 'not-a-url'], - 'non-http issuer url' => ['base_url', 'ftp://idp.example.com'], -]); - -it('does not enable oidc without required fields', function () { - actingAsInstanceAdmin(); - - Livewire::test(SettingsOauth::class) - ->set('oauth_settings_map.oidc.enabled', true) - ->call('instantSave', 'oidc') - ->assertDispatched('error'); - - expect(OauthSetting::where('provider', 'oidc')->first()->enabled)->toBeFalse(); -}); - -it('keeps provider disabled in the ui when enable validation fails', function () { - actingAsInstanceAdmin(); - - Livewire::test(SettingsOauth::class, ['provider' => 'authentik']) - ->call('toggleProvider', 'authentik') - ->assertDispatched('error') - ->assertSet('oauth_settings_map.authentik.enabled', false); - - expect(OauthSetting::where('provider', 'authentik')->first()->enabled)->toBeFalse(); -}); - -it('disables an enabled provider gracefully when required fields become incomplete', function () { - actingAsInstanceAdmin(); - - OauthSetting::where('provider', 'authentik')->first()->forceFill([ - 'enabled' => true, - 'client_id' => 'authentik-client', - 'client_secret' => 'authentik-secret', - 'base_url' => 'https://authentik.example.com', - ])->save(); - - Livewire::test(SettingsOauth::class, ['provider' => 'authentik']) - ->set('oauth_settings_map.authentik.client_secret', '') - ->call('submit') - ->assertDispatched('error') - ->assertSet('oauth_settings_map.authentik.enabled', false); - - expect(OauthSetting::where('provider', 'authentik')->first()->enabled)->toBeFalse(); -}); - -it('toggles provider enabled state from the action button', function () { - actingAsInstanceAdmin(); - - Livewire::test(SettingsOauth::class, ['provider' => 'authentik']) - ->set('oauth_settings_map.authentik.client_id', 'authentik-client') - ->set('oauth_settings_map.authentik.client_secret', 'authentik-secret') - ->set('oauth_settings_map.authentik.base_url', 'https://authentik.example.com') - ->call('toggleProvider', 'authentik') - ->assertHasNoErrors(); - - expect(OauthSetting::where('provider', 'authentik')->first()->enabled)->toBeTrue(); -}); diff --git a/tests/Feature/SshMultiplexingLockTest.php b/tests/Feature/SshMultiplexingLockTest.php index 272156fbd..45e150dfa 100644 --- a/tests/Feature/SshMultiplexingLockTest.php +++ b/tests/Feature/SshMultiplexingLockTest.php @@ -153,7 +153,7 @@ function makeMuxServer(): Server ->toContain('-o ControlMaster=auto') ->toContain("-o ControlPath=/var/www/html/storage/app/ssh/mux/mux_{$server->uuid}") ->toContain('-o ControlPersist=3600') - ->toContain("'if command -v bash >/dev/null 2>&1; then exec bash -se; else exec sh -se; fi' << \\") + ->toContain("'bash -se' << \\") ->not->toContain('<< $delimiter'); Process::assertRan(fn ($process) => str_contains($process->command, 'ssh -fN ')); diff --git a/tests/Feature/UserSeederTest.php b/tests/Feature/UserSeederTest.php deleted file mode 100644 index d8ccf8651..000000000 --- a/tests/Feature/UserSeederTest.php +++ /dev/null @@ -1,16 +0,0 @@ -seed(UserSeeder::class); - - $user = User::factory()->create(); - - expect(User::query()->orderBy('id')->pluck('id')->all())->toBe([0, 1, 2, 3]) - ->and($user->id)->toBe(3); -}); diff --git a/tests/Unit/Actions/Server/AlpinePackageManagerTest.php b/tests/Unit/Actions/Server/AlpinePackageManagerTest.php deleted file mode 100644 index d8050c84d..000000000 --- a/tests/Unit/Actions/Server/AlpinePackageManagerTest.php +++ /dev/null @@ -1,62 +0,0 @@ -invoke(new InstallPrerequisites); - - expect($commands)->toContain('command -v bash >/dev/null || apk add bash'); -}); - -it('installs every Docker CLI plugin required on Alpine', function () { - $method = new ReflectionMethod(InstallDocker::class, 'getAlpineDockerInstallCommand'); - - $command = $method->invoke(new InstallDocker); - - expect($command)->toContain('apk add docker docker-cli-buildx docker-cli-compose'); -}); - -it('uses OpenRC instead of systemd to restart Docker on Alpine', function () { - $method = new ReflectionMethod(InstallDocker::class, 'getDockerServiceCommands'); - - $action = new InstallDocker; - $commands = $method->invoke($action, true); - - expect($commands) - ->toBe(['rc-update add docker default', 'rc-service docker restart']) - ->each->not->toContain('systemctl') - ->and($method->invoke($action, false)) - ->toBe(['systemctl enable docker >/dev/null 2>&1 || true', 'systemctl restart docker']); -}); - -it('parses Alpine package updates', function () { - $method = new ReflectionMethod(CheckUpdates::class, 'parseApkOutput'); - $output = <<<'OUTPUT' -docker-cli-compose-2.31.0-r5 x86_64 {docker-cli-compose} (Apache-2.0) [upgradable from: docker-cli-compose-2.31.0-r4] -libcrypto3-3.3.4-r0 aarch64 {openssl} (Apache-2.0) [upgradable from: libcrypto3-3.3.3-r0] -OUTPUT; - - $result = $method->invoke(new CheckUpdates, $output); - - expect($result)->toBe([ - 'total_updates' => 2, - 'updates' => [ - [ - 'package' => 'docker-cli-compose', - 'new_version' => '2.31.0-r5', - 'architecture' => 'x86_64', - 'current_version' => '2.31.0-r4', - ], - [ - 'package' => 'libcrypto3', - 'new_version' => '3.3.4-r0', - 'architecture' => 'aarch64', - 'current_version' => '3.3.3-r0', - ], - ], - ]); -}); diff --git a/tests/Unit/DeploymentConfiguration/ApplicationConfigurationSnapshotTest.php b/tests/Unit/DeploymentConfiguration/ApplicationConfigurationSnapshotTest.php index 1b106a5a8..afad0593f 100644 --- a/tests/Unit/DeploymentConfiguration/ApplicationConfigurationSnapshotTest.php +++ b/tests/Unit/DeploymentConfiguration/ApplicationConfigurationSnapshotTest.php @@ -296,7 +296,7 @@ function markSnapshotTestApplicationDeployed(Application $application): Applicat expect(app(ConfigurationDiffer::class)->diff($previousSnapshot, $currentSnapshot)->isChanged())->toBeFalse(); }); -it('detects environment variable value changes for unlocked variables', function () { +it('detects environment variable value changes without exposing secret values', function () { $application = snapshotTestApplication(); EnvironmentVariable::create([ 'key' => 'API_TOKEN', @@ -315,13 +315,13 @@ function markSnapshotTestApplicationDeployed(Application $application): Applicat $change = collect($diff->changes())->firstWhere('label', 'API_TOKEN'); expect($change)->not->toBeNull() - ->and($change['display_summary'])->toBeNull() - ->and($change['old_display_value'])->toBe('old-secret') - ->and($change['new_display_value'])->toBe('new-secret') - ->and(json_encode($diff->toArray()))->toContain('old-secret')->toContain('new-secret'); + ->and($change['display_summary'])->toBe('Changed') + ->and($change['old_display_value'])->toBe('••••••••') + ->and($change['new_display_value'])->toBe('••••••••') + ->and(json_encode($diff->toArray()))->not->toContain('old-secret')->not->toContain('new-secret'); }); -it('describes added unlocked environment variables with their value', function () { +it('describes added environment variables as set without exposing secret values', function () { $application = snapshotTestApplication(); markSnapshotTestApplicationDeployed($application); @@ -342,6 +342,6 @@ function markSnapshotTestApplicationDeployed(Application $application): Applicat expect($change)->not->toBeNull() ->and($change['display_summary'])->toBeNull() ->and($change['old_display_value'])->toBe('-') - ->and($change['new_display_value'])->toBe('new-secret') - ->and(json_encode($diff->toArray()))->toContain('new-secret'); + ->and($change['new_display_value'])->toBe('••••••••') + ->and(json_encode($diff->toArray()))->not->toContain('new-secret'); }); diff --git a/tests/Unit/OauthSettingTest.php b/tests/Unit/OauthSettingTest.php deleted file mode 100644 index 48fb50c37..000000000 --- a/tests/Unit/OauthSettingTest.php +++ /dev/null @@ -1,30 +0,0 @@ - 'oidc']); - expect($setting->couldBeEnabled())->toBeFalse(); - - $setting->fill([ - 'client_id' => 'client-id', - 'client_secret' => 'secret', - 'base_url' => 'https://idp.example.com', - ]); - - expect($setting->couldBeEnabled())->toBeTrue(); -}); - -it('returns configured scopes and custom login label', function () { - $setting = new OauthSetting([ - 'provider' => 'oidc', - 'scopes' => 'openid email profile groups', - 'custom_label' => 'Login with Okta', - ]); - - expect($setting->scopeList())->toBe(['openid', 'email', 'profile', 'groups']) - ->and($setting->loginLabel())->toBe('Login with Okta'); -}); diff --git a/tests/Unit/OidcDiscoveryServiceTest.php b/tests/Unit/OidcDiscoveryServiceTest.php deleted file mode 100644 index 18c358fd1..000000000 --- a/tests/Unit/OidcDiscoveryServiceTest.php +++ /dev/null @@ -1,119 +0,0 @@ - Http::response([ - 'issuer' => 'https://idp.example.com', - 'authorization_endpoint' => 'https://idp.example.com/auth', - 'token_endpoint' => 'https://idp.example.com/token', - 'userinfo_endpoint' => 'https://idp.example.com/userinfo', - 'jwks_uri' => 'https://idp.example.com/jwks', - ]), - 'https://idp.example.com/jwks' => Http::response(['keys' => [['kid' => 'one']]]), - ]); - - $service = app(OidcDiscoveryService::class); - - $discovery = $service->discover('https://idp.example.com'); - $jwks = $service->jwks($discovery->jwksUri); - - expect($discovery->issuer)->toBe('https://idp.example.com') - ->and($jwks['keys'][0]['kid'])->toBe('one'); - - Http::assertSentCount(2); - - $service->discover('https://idp.example.com'); - $service->jwks('https://idp.example.com/jwks'); - - Http::assertSentCount(2); -}); - -it('does not cache discovery documents with mismatched issuers', function () { - Cache::flush(); - Http::fakeSequence('https://idp.example.com/.well-known/openid-configuration') - ->push([ - 'issuer' => 'https://evil.example.com', - 'authorization_endpoint' => 'https://idp.example.com/auth', - 'token_endpoint' => 'https://idp.example.com/token', - 'userinfo_endpoint' => 'https://idp.example.com/userinfo', - 'jwks_uri' => 'https://idp.example.com/jwks', - ]) - ->push([ - 'issuer' => 'https://idp.example.com', - 'authorization_endpoint' => 'https://idp.example.com/auth', - 'token_endpoint' => 'https://idp.example.com/token', - 'userinfo_endpoint' => 'https://idp.example.com/userinfo', - 'jwks_uri' => 'https://idp.example.com/jwks', - ]); - - $service = app(OidcDiscoveryService::class); - $cacheKey = 'oidc:discovery:'.hash('sha256', 'https://idp.example.com'); - - expect(fn () => $service->discover('https://idp.example.com')) - ->toThrow(OidcDiscoveryException::class, 'Discovery issuer does not match the configured issuer URL.') - ->and(Cache::has($cacheKey))->toBeFalse() - ->and($service->discover('https://idp.example.com')->issuer)->toBe('https://idp.example.com'); - - Http::assertSentCount(2); -}); - -it('refetches jwks once on forced refresh to pick up rotated keys', function () { - Cache::flush(); - Http::fakeSequence('https://idp.example.com/jwks') - ->push(['keys' => [['kid' => 'old']]]) - ->push(['keys' => [['kid' => 'new']]]); - - $service = app(OidcDiscoveryService::class); - - expect($service->jwks('https://idp.example.com/jwks')['keys'][0]['kid'])->toBe('old'); - - // Forced refresh bypasses the cache and sees the rotated key. - expect($service->jwks('https://idp.example.com/jwks', true)['keys'][0]['kid'])->toBe('new'); - Http::assertSentCount(2); - - // Cooldown prevents a second immediate upstream fetch; cached value returned. - expect($service->jwks('https://idp.example.com/jwks', true)['keys'][0]['kid'])->toBe('new'); - Http::assertSentCount(2); -}); - -it('rejects invalid discovery and jwks payloads', function () { - Cache::flush(); - Http::fake([ - 'https://bad.example.com/.well-known/openid-configuration' => Http::response(['issuer' => 'https://bad.example.com']), - ]); - - app(OidcDiscoveryService::class)->discover('https://bad.example.com'); -})->throws(OidcDiscoveryException::class); - -it('rejects jwks responses without keys', function () { - Cache::flush(); - Http::fake([ - 'https://idp.example.com/jwks' => Http::response(['empty' => true]), - ]); - - app(OidcDiscoveryService::class)->jwks('https://idp.example.com/jwks'); -})->throws(OidcJwksException::class); - -it('rejects non-https issuer urls', function () { - Cache::flush(); - Http::fake(); - - app(OidcDiscoveryService::class)->discover('http://idp.example.com'); -})->throws(OidcDiscoveryException::class, 'Issuer URL must be an absolute HTTPS URL.'); - -it('rejects non-https jwks uris', function () { - Cache::flush(); - Http::fake(); - - app(OidcDiscoveryService::class)->jwks('http://idp.example.com/jwks'); -})->throws(OidcJwksException::class, 'JWKS URI must be an absolute HTTPS URL.'); diff --git a/tests/Unit/OidcProviderPkceTest.php b/tests/Unit/OidcProviderPkceTest.php deleted file mode 100644 index b92ff58ff..000000000 --- a/tests/Unit/OidcProviderPkceTest.php +++ /dev/null @@ -1,148 +0,0 @@ -getAuthUrl($state); - } -} - -function oidc_provider_discovery_document(): OidcDiscoveryDocument -{ - return new OidcDiscoveryDocument( - issuer: 'https://idp.example.com', - authorizationEndpoint: 'https://idp.example.com/oauth2/authorize', - tokenEndpoint: 'https://idp.example.com/oauth2/token', - userinfoEndpoint: 'https://idp.example.com/oauth2/userinfo', - jwksUri: 'https://idp.example.com/.well-known/jwks.json', - ); -} - -function oidc_provider_session(): Store -{ - $session = new Store('testing', new ArraySessionHandler(1200)); - $session->start(); - - return $session; -} - -function oidc_provider_request(Store $session, string $state = 'state-value'): Request -{ - $request = Request::create('/auth/oidc/callback', 'GET', ['state' => $state]); - $request->setLaravelSession($session); - - return $request; -} - -function oidc_provider(Request $request): TestOidcProviderWithExposedAuthUrl -{ - /** @var OidcDiscoveryService&MockInterface $discoveryService */ - $discoveryService = Mockery::mock(OidcDiscoveryService::class); - $discoveryService->shouldReceive('discover') - ->byDefault() - ->with('https://idp.example.com') - ->andReturn(oidc_provider_discovery_document()); - - /** @var OidcTokenValidator&MockInterface $tokenValidator */ - $tokenValidator = Mockery::mock(OidcTokenValidator::class); - - return (new TestOidcProviderWithExposedAuthUrl( - $request, - $discoveryService, - $tokenValidator, - 'client-id', - 'client-secret', - 'https://coolify.example.com/auth/oidc/callback', - ))->setConfig(new OidcConfig( - issuerUrl: 'https://idp.example.com', - clientId: 'client-id', - clientSecret: 'client-secret', - redirectUri: 'https://coolify.example.com/auth/oidc/callback', - usePkce: true, - )); -} - -it('stores oidc nonce and pkce verifier with a ten minute expiry', function () { - Carbon::setTestNow('2026-06-15 12:00:00'); - - try { - $session = oidc_provider_session(); - $provider = oidc_provider(oidc_provider_request($session)); - - $provider->authUrlForState('state-value'); - - $nonceEntry = $session->get('oidc.nonce.state-value'); - $verifierEntry = $session->get('oidc.code_verifier.state-value'); - - expect($nonceEntry)->toBeArray() - ->and($nonceEntry['value'])->toBeString()->not->toBeEmpty() - ->and($nonceEntry['expires_at'])->toBe(now()->addMinutes(10)->timestamp) - ->and($verifierEntry)->toBeArray() - ->and($verifierEntry['value'])->toBeString()->not->toBeEmpty() - ->and($verifierEntry['expires_at'])->toBe(now()->addMinutes(10)->timestamp); - } finally { - Carbon::setTestNow(); - } -}); - -it('sends a fresh oidc pkce verifier during token exchange', function () { - $session = oidc_provider_session(); - $session->put('oidc.code_verifier.state-value', [ - 'value' => 'fresh-verifier', - 'expires_at' => now()->addMinute()->timestamp, - ]); - - $provider = oidc_provider(oidc_provider_request($session)); - $history = []; - $handler = HandlerStack::create(new MockHandler([ - new Response(200, [], json_encode(['access_token' => 'access-token', 'id_token' => 'id-token'], JSON_THROW_ON_ERROR)), - ])); - $handler->push(Middleware::history($history)); - $provider->setHttpClient(new Client(['handler' => $handler])); - - $provider->getAccessTokenResponse('authorization-code'); - - parse_str((string) $history[0]['request']->getBody(), $tokenRequestFields); - - expect($tokenRequestFields['code_verifier'] ?? null)->toBe('fresh-verifier') - ->and($session->has('oidc.code_verifier.state-value'))->toBeFalse(); -}); - -it('throws a session expired error for an expired oidc pkce verifier during token exchange', function () { - $session = oidc_provider_session(); - $session->put('oidc.code_verifier.state-value', [ - 'value' => 'expired-verifier', - 'expires_at' => now()->subSecond()->timestamp, - ]); - - $provider = oidc_provider(oidc_provider_request($session)); - $history = []; - $handler = HandlerStack::create(new MockHandler([ - new Response(200, [], json_encode(['access_token' => 'access-token', 'id_token' => 'id-token'], JSON_THROW_ON_ERROR)), - ])); - $handler->push(Middleware::history($history)); - $provider->setHttpClient(new Client(['handler' => $handler])); - - $provider->getAccessTokenResponse('authorization-code'); -})->throws(OidcException::class, 'OIDC login session expired. Please try again.'); diff --git a/tests/Unit/OidcTokenValidatorTest.php b/tests/Unit/OidcTokenValidatorTest.php deleted file mode 100644 index 9b1d9a24c..000000000 --- a/tests/Unit/OidcTokenValidatorTest.php +++ /dev/null @@ -1,187 +0,0 @@ - 2048, - 'private_key_type' => OPENSSL_KEYTYPE_RSA, - ]); - - openssl_pkey_export($privateKey, $privatePem); - $details = openssl_pkey_get_details($privateKey); - - return [ - 'private_pem' => $privatePem, - 'jwks' => [ - 'keys' => [[ - 'kty' => 'RSA', - 'kid' => $kid, - 'alg' => 'RS256', - 'use' => 'sig', - 'n' => oidc_base64url($details['rsa']['n']), - 'e' => oidc_base64url($details['rsa']['e']), - ]], - ], - ]; -} - -function oidc_token(array $claims, string $privatePem, string $kid = 'test-key', string $algorithm = 'RS256'): string -{ - $header = oidc_base64url(json_encode(['alg' => $algorithm, 'typ' => 'JWT', 'kid' => $kid], JSON_THROW_ON_ERROR)); - $payload = oidc_base64url(json_encode($claims, JSON_THROW_ON_ERROR)); - $signatureInput = $header.'.'.$payload; - openssl_sign($signatureInput, $signature, $privatePem, OPENSSL_ALGO_SHA256); - - return $signatureInput.'.'.oidc_base64url($signature); -} - -function oidc_discovery(): OidcDiscoveryDocument -{ - return new OidcDiscoveryDocument( - issuer: 'https://idp.example.com', - authorizationEndpoint: 'https://idp.example.com/oauth2/authorize', - tokenEndpoint: 'https://idp.example.com/oauth2/token', - userinfoEndpoint: 'https://idp.example.com/oauth2/userinfo', - jwksUri: 'https://idp.example.com/.well-known/jwks.json', - ); -} - -it('validates a well formed RS256 id token', function () { - $keyset = oidc_keyset(); - $now = time(); - $token = oidc_token([ - 'iss' => 'https://idp.example.com', - 'aud' => 'client-id', - 'sub' => 'okta-user-1', - 'iat' => $now, - 'exp' => $now + 600, - 'nonce' => 'expected-nonce', - 'email' => 'User@Example.com', - ], $keyset['private_pem']); - - $claims = app(OidcTokenValidator::class)->validate( - idToken: $token, - discovery: oidc_discovery(), - jwks: $keyset['jwks'], - clientId: 'client-id', - expectedNonce: 'expected-nonce', - ); - - expect($claims['sub'])->toBe('okta-user-1') - ->and($claims['email'])->toBe('User@Example.com'); -}); - -it('rejects invalid token claims', function (array $claimOverrides, string $message) { - $keyset = oidc_keyset(); - $now = time(); - $claims = array_merge([ - 'iss' => 'https://idp.example.com', - 'aud' => 'client-id', - 'sub' => 'okta-user-1', - 'iat' => $now, - 'exp' => $now + 600, - 'nonce' => 'expected-nonce', - ], $claimOverrides); - - $token = oidc_token($claims, $keyset['private_pem']); - - app(OidcTokenValidator::class)->validate( - idToken: $token, - discovery: oidc_discovery(), - jwks: $keyset['jwks'], - clientId: 'client-id', - expectedNonce: 'expected-nonce', - ); -})->throws(OidcTokenException::class)->with([ - 'issuer mismatch' => [['iss' => 'https://evil.example.com'], 'issuer'], - 'audience mismatch' => [['aud' => 'other-client'], 'audience'], - 'azp missing for multi audience' => [['aud' => ['client-id', 'other-client']], 'azp'], - 'azp mismatch' => [['aud' => ['client-id', 'other-client'], 'azp' => 'other-client'], 'azp'], - 'expired token' => [['exp' => time() - 3600], 'expired'], - 'future issued at' => [['iat' => time() + 3600], 'issued'], - 'nonce mismatch' => [['nonce' => 'wrong-nonce'], 'nonce'], - 'missing subject' => [['sub' => null], 'subject'], - 'empty subject' => [['sub' => ''], 'subject'], - 'non-string subject' => [['sub' => 123], 'subject'], -]); - -it('rejects a bad signature and unknown key id', function (string $kid) { - $keyset = oidc_keyset('test-key'); - $otherKeyset = oidc_keyset($kid); - $now = time(); - $token = oidc_token([ - 'iss' => 'https://idp.example.com', - 'aud' => 'client-id', - 'sub' => 'okta-user-1', - 'iat' => $now, - 'exp' => $now + 600, - 'nonce' => 'expected-nonce', - ], $otherKeyset['private_pem'], $kid); - - app(OidcTokenValidator::class)->validate( - idToken: $token, - discovery: oidc_discovery(), - jwks: $keyset['jwks'], - clientId: 'client-id', - expectedNonce: 'expected-nonce', - ); -})->throws(OidcTokenException::class)->with([ - 'same kid with bad signature' => ['test-key'], - 'unknown kid' => ['other-key'], -]); - -it('rejects disallowed algorithms', function () { - $keyset = oidc_keyset(); - $now = time(); - $token = oidc_token([ - 'iss' => 'https://idp.example.com', - 'aud' => 'client-id', - 'sub' => 'okta-user-1', - 'iat' => $now, - 'exp' => $now + 600, - ], $keyset['private_pem'], algorithm: 'HS256'); - - app(OidcTokenValidator::class)->validate($token, oidc_discovery(), $keyset['jwks'], 'client-id'); -})->throws(OidcTokenException::class); - -it('throws a dedicated exception when the signing key is unknown', function () { - $keyset = oidc_keyset('current-key'); - $token = oidc_token([ - 'iss' => 'https://idp.example.com', - 'aud' => 'client-id', - 'sub' => 'okta-user-1', - 'iat' => time(), - 'exp' => time() + 600, - ], $keyset['private_pem'], 'rotated-key'); - - app(OidcTokenValidator::class)->validate($token, oidc_discovery(), $keyset['jwks'], 'client-id'); -})->throws(OidcSigningKeyNotFoundException::class); - -it('rejects a jwks key not designated for signing', function () { - $keyset = oidc_keyset(); - $keyset['jwks']['keys'][0]['use'] = 'enc'; - $now = time(); - $token = oidc_token([ - 'iss' => 'https://idp.example.com', - 'aud' => 'client-id', - 'sub' => 'okta-user-1', - 'iat' => $now, - 'exp' => $now + 600, - ], $keyset['private_pem']); - - // An encryption-only key is dropped from the keyset, so the kid no longer resolves. - app(OidcTokenValidator::class)->validate($token, oidc_discovery(), $keyset['jwks'], 'client-id'); -})->throws(OidcTokenException::class); diff --git a/tests/Unit/SshMultiplexingDisableTest.php b/tests/Unit/SshMultiplexingDisableTest.php index 4dedc7a76..d2d4ae600 100644 --- a/tests/Unit/SshMultiplexingDisableTest.php +++ b/tests/Unit/SshMultiplexingDisableTest.php @@ -23,16 +23,6 @@ public function test_generate_ssh_command_method_exists() ); } - public function test_remote_shell_prefers_bash_and_falls_back_to_sh() - { - $reflection = new \ReflectionMethod(SshMultiplexingHelper::class, 'remoteShellCommand'); - - $this->assertSame( - 'if command -v bash >/dev/null 2>&1; then exec bash -se; else exec sh -se; fi', - $reflection->invoke(null) - ); - } - public function test_generate_ssh_command_accepts_disable_multiplexing_parameter() { $reflection = new \ReflectionMethod(SshMultiplexingHelper::class, 'generateSshCommand'); diff --git a/tests/v4/Feature/DangerDeleteResourceTest.php b/tests/v4/Feature/DangerDeleteResourceTest.php index 4a275ad48..7a73f5979 100644 --- a/tests/v4/Feature/DangerDeleteResourceTest.php +++ b/tests/v4/Feature/DangerDeleteResourceTest.php @@ -4,7 +4,6 @@ use App\Models\Application; use App\Models\Environment; use App\Models\InstanceSettings; -use App\Models\OauthIdentity; use App\Models\Project; use App\Models\Server; use App\Models\StandaloneDocker; @@ -19,7 +18,7 @@ uses(RefreshDatabase::class); beforeEach(function () { - InstanceSettings::forceCreate(['id' => 0]); + InstanceSettings::create(['id' => 0]); Queue::fake(); $this->user = User::factory()->create([ @@ -71,21 +70,6 @@ expect(Application::find($this->application->id))->toBeNull(); }); -test('delete succeeds without password for an oauth user', function () { - OauthIdentity::create([ - 'user_id' => $this->user->id, - 'provider' => 'oidc', - 'issuer' => 'https://idp.example.com', - 'provider_user_id' => 'oauth-user-id', - ]); - - Livewire::test(Danger::class, ['resource' => $this->application]) - ->call('delete', '') - ->assertHasNoErrors(); - - expect(Application::find($this->application->id))->toBeNull(); -}); - test('delete applies selectedActions from checkbox state', function () { $component = Livewire::test(Danger::class, ['resource' => $this->application]) ->call('delete', 'test-password', ['delete_configurations', 'docker_cleanup']);