Skip to content

fix: additional provider and issuer checks#2326

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
fadymak merged 1 commit into from
Jan 12, 2026
Merged

fix: additional provider and issuer checks #2326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 31 additions & 18 deletions internal/api/token_oidc.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import (
"fmt"
"net/http"
"slices"
"strings"

"github.com/coreos/go-oidc/v3/oidc"
"github.com/supabase/auth/internal/api/apierrors"
Expand DownExpand Up@@ -36,23 +37,29 @@ func (p *IdTokenGrantParams) getProvider(ctx context.Context, config *conf.Globa
var providerType string
var acceptableClientIDs []string

if p.Issuer != "" {
log.WithField("issuer", p.Issuer).WithField("provider", p.Provider).Info("Issuer provided in request.")
}

switch true {
case p.Provider == "apple" || provider.IsAppleIssuer(p.Issuer):
cfg = &config.External.Apple
providerType = "apple"
issuer = p.Issuer
if issuer == "" {
detectedIssuer, err := provider.DetectAppleIDTokenIssuer(ctx, p.IdToken)
if err != nil {
return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Unable to detect issuer in ID token for Apple provider").WithInternalError(err)
}

if provider.IsAppleIssuer(detectedIssuer) {
issuer = detectedIssuer
} else {
return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Detected ID token issuer is not an Apple ID token issuer")
}
detectedIssuer, err := provider.DetectAppleIDTokenIssuer(ctx, p.IdToken)
if err != nil {
return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Unable to detect issuer in ID token for Apple provider").WithInternalError(err)
}

if !provider.IsAppleIssuer(detectedIssuer) {
return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Detected ID token issuer is not an Apple ID token issuer")
}

if p.Issuer != "" && p.Issuer != detectedIssuer {
return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Provided issuer does not match ID token issuer")
}

issuer = detectedIssuer
acceptableClientIDs = append(acceptableClientIDs, config.External.Apple.ClientID...)

if config.External.IosBundleId != "" {
Expand All@@ -66,14 +73,20 @@ func (p *IdTokenGrantParams) getProvider(ctx context.Context, config *conf.Globa
acceptableClientIDs = append(acceptableClientIDs, config.External.Google.ClientID...)

case p.Provider == "azure" || provider.IsAzureIssuer(p.Issuer):
issuer = p.Issuer
if issuer == "" || !provider.IsAzureIssuer(issuer) {
detectedIssuer, err := provider.DetectAzureIDTokenIssuer(ctx, p.IdToken)
if err != nil {
return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Unable to detect issuer in ID token for Azure provider").WithInternalError(err)
}
issuer = detectedIssuer
detectedIssuer, err := provider.DetectAzureIDTokenIssuer(ctx, p.IdToken)
if err != nil {
return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Unable to detect issuer in ID token for Azure provider").WithInternalError(err)
}

if !strings.HasPrefix(detectedIssuer, "https://login.microsoftonline.com/") && !strings.HasPrefix(detectedIssuer, "https://sts.windows.net/") {
return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Detected ID token issuer is not an Azure ID token issuer")
}

if p.Issuer != "" && p.Issuer != detectedIssuer {
return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Provided issuer does not match ID token issuer")
}

issuer = detectedIssuer
cfg = &config.External.Azure
providerType = "azure"
acceptableClientIDs = append(acceptableClientIDs, config.External.Azure.ClientID...)
Expand Down
100 changes: 100 additions & 0 deletions internal/api/token_oidc_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,8 @@ package api

import (
"context"
"encoding/base64"
"encoding/json"
"net/http"
"net/http/httptest"
"testing"
Expand DownExpand Up@@ -68,3 +70,101 @@ func (ts *TokenOIDCTestSuite) TestGetProvider() {
require.Equal(ts.T(), params.Provider, providerType)
require.NotEmpty(ts.T(), acceptableClientIds)
}

// createFakeIDToken creates a fake JWT token with a specific issuer claim for testing
// WARNING: This is for testing purposes only and creates an unsigned token
func createFakeIDToken(issuer string, sub string) string {
header := map[string]interface{}{
"alg": "RS256",
"typ": "JWT",
}

payload := map[string]interface{}{
"iss": issuer,
"sub": sub,
"aud": "test-client-id",
"exp": 9999999999,
"iat": 1234567890,
}

headerJSON, _ := json.Marshal(header)
payloadJSON, _ := json.Marshal(payload)

headerEncoded := base64.RawURLEncoding.EncodeToString(headerJSON)
payloadEncoded := base64.RawURLEncoding.EncodeToString(payloadJSON)

// Note: signature is fake, but the issuer detection only looks at the payload
return headerEncoded + "." + payloadEncoded + ".fake-signature"
}

func (ts *TokenOIDCTestSuite) TestGetProviderAppleWithIncorrectIssuer() {
incorrectIssuer := SetupTestOIDCProvider(ts)
defer incorrectIssuer.Close()

ts.Config.External.Apple.Enabled = true
ts.Config.External.Apple.ClientID = []string{"com.example.app"}

// Create a token with an invalid issuer
nonAppleToken := createFakeIDToken(incorrectIssuer.URL, "user123")

// provider="apple" but with an incorrect issuer in the token
params := &IdTokenGrantParams{
IdToken: nonAppleToken,
Provider: "apple",
Issuer: incorrectIssuer.URL,
}

req := httptest.NewRequest(http.MethodPost, "http://localhost", nil)
_, _, _, _, _, err := params.getProvider(context.Background(), ts.Config, req)

require.Error(ts.T(), err)
require.Contains(ts.T(), err.Error(), "not an Apple ID token issuer")
}

// TestGetProviderAzureWithNonAzureTokenIssuer tests that Azure provider only
// accepts tokens from login.microsoftonline.com and sts.windows.net
func (ts *TokenOIDCTestSuite) TestGetProviderAzureWithNonAzureTokenIssuer() {
ts.Config.External.Azure.Enabled = true
ts.Config.External.Azure.ClientID = []string{"test-client-id"}

// Create a token with an incorrect issuer
nonAzureIssuer := "https://non-azure-issuer.example.com"
nonAzureToken := createFakeIDToken(nonAzureIssuer, "user123")

params := &IdTokenGrantParams{
IdToken: nonAzureToken,
Provider: "azure",
Issuer: nonAzureIssuer,
}

req := httptest.NewRequest(http.MethodPost, "http://localhost", nil)
_, _, _, _, _, err := params.getProvider(context.Background(), ts.Config, req)

// This should fail - the token's issuer is not an accepted issuer
require.Error(ts.T(), err)
require.Contains(ts.T(), err.Error(), "not an Azure ID token issuer")
}

// TestGetProviderAppleWithInvalidIssuerInToken tests that Apple provider rejects
// tokens when the actual token issuer does not match the expected issuer
func (ts *TokenOIDCTestSuite) TestGetProviderAppleWithNonAppleIssuerInToken() {
ts.Config.External.Apple.Enabled = true
ts.Config.External.Apple.ClientID = []string{"com.example.app"}

// Create a token with an incorrect issuer
nonAppleIssuer := "https://non-apple-issuer.example.com"
nonAppleToken := createFakeIDToken(nonAppleIssuer, "user123")

params := &IdTokenGrantParams{
IdToken: nonAppleToken,
Provider: "apple",
Issuer: "https://appleid.apple.com",
}

req := httptest.NewRequest(http.MethodPost, "http://localhost", nil)
_, _, _, _, _, err := params.getProvider(context.Background(), ts.Config, req)

// This should fail - the token's actual issuer is not appleid.apple.com
require.Error(ts.T(), err)
require.Contains(ts.T(), err.Error(), "not an Apple ID token issuer")
}
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix: additional provider and issuer checks by fadymak · Pull Request #2326 · supabase/auth · GitHub
Skip to content
fix: additional provider and issuer checks#2326

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

fadymak
merged 1 commit into

from

Jan 12, 2026
 Merged


fix: additional provider and issuer checks
#2326
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


49 changes: 31 additions & 18 deletions
internal/api/token_oidc.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import (
	"fmt"
	"net/http"
	"slices"
	"strings"

	"github.com/coreos/go-oidc/v3/oidc"
	"github.com/supabase/auth/internal/api/apierrors"
Expand DownExpand Up@@ -36,23 +37,29 @@ func (p *IdTokenGrantParams) getProvider(ctx context.Context, config *conf.Globa
	var providerType string
	var acceptableClientIDs []string

	if p.Issuer != "" {
 log.WithField("issuer", p.Issuer).WithField("provider", p.Provider).Info("Issuer provided in request.")
	}

	switch true {
	case p.Provider == "apple" || provider.IsAppleIssuer(p.Issuer):
 cfg = &config.External.Apple
 providerType = "apple"
 issuer = p.Issuer
 if issuer == "" {
 detectedIssuer, err := provider.DetectAppleIDTokenIssuer(ctx, p.IdToken)
 if err != nil {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Unable to detect issuer in ID token for Apple provider").WithInternalError(err)
 }

 if provider.IsAppleIssuer(detectedIssuer) {
 issuer = detectedIssuer
 } else {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Detected ID token issuer is not an Apple ID token issuer")
 }
 detectedIssuer, err := provider.DetectAppleIDTokenIssuer(ctx, p.IdToken)
 if err != nil {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Unable to detect issuer in ID token for Apple provider").WithInternalError(err)
 }

 if !provider.IsAppleIssuer(detectedIssuer) {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Detected ID token issuer is not an Apple ID token issuer")
 }

 if p.Issuer != "" && p.Issuer != detectedIssuer {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Provided issuer does not match ID token issuer")
 }

 issuer = detectedIssuer
 acceptableClientIDs = append(acceptableClientIDs, config.External.Apple.ClientID...)

 if config.External.IosBundleId != "" {
Expand All@@ -66,14 +73,20 @@ func (p *IdTokenGrantParams) getProvider(ctx context.Context, config *conf.Globa
 acceptableClientIDs = append(acceptableClientIDs, config.External.Google.ClientID...)

	case p.Provider == "azure" || provider.IsAzureIssuer(p.Issuer):
 issuer = p.Issuer
 if issuer == "" || !provider.IsAzureIssuer(issuer) {
 detectedIssuer, err := provider.DetectAzureIDTokenIssuer(ctx, p.IdToken)
 if err != nil {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Unable to detect issuer in ID token for Azure provider").WithInternalError(err)
 }
 issuer = detectedIssuer
 detectedIssuer, err := provider.DetectAzureIDTokenIssuer(ctx, p.IdToken)
 if err != nil {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Unable to detect issuer in ID token for Azure provider").WithInternalError(err)
 }

 if !strings.HasPrefix(detectedIssuer, "https://login.microsoftonline.com/") && !strings.HasPrefix(detectedIssuer, "https://sts.windows.net/") {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Detected ID token issuer is not an Azure ID token issuer")
 }

 if p.Issuer != "" && p.Issuer != detectedIssuer {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Provided issuer does not match ID token issuer")
 }

 issuer = detectedIssuer
 cfg = &config.External.Azure
 providerType = "azure"
 acceptableClientIDs = append(acceptableClientIDs, config.External.Azure.ClientID...)
Expand Down

100 changes: 100 additions & 0 deletions
internal/api/token_oidc_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,8 @@ package api

import (
	"context"
	"encoding/base64"
	"encoding/json"
	"net/http"
	"net/http/httptest"
	"testing"
Expand DownExpand Up@@ -68,3 +70,101 @@ func (ts *TokenOIDCTestSuite) TestGetProvider() {
	require.Equal(ts.T(), params.Provider, providerType)
	require.NotEmpty(ts.T(), acceptableClientIds)
}

// createFakeIDToken creates a fake JWT token with a specific issuer claim for testing
// WARNING: This is for testing purposes only and creates an unsigned token
func createFakeIDToken(issuer string, sub string) string {
	header := map[string]interface{}{
 "alg": "RS256",
 "typ": "JWT",
	}

	payload := map[string]interface{}{
 "iss": issuer,
 "sub": sub,
 "aud": "test-client-id",
 "exp": 9999999999,
 "iat": 1234567890,
	}

	headerJSON, _ := json.Marshal(header)
	payloadJSON, _ := json.Marshal(payload)

	headerEncoded := base64.RawURLEncoding.EncodeToString(headerJSON)
	payloadEncoded := base64.RawURLEncoding.EncodeToString(payloadJSON)

	// Note: signature is fake, but the issuer detection only looks at the payload
	return headerEncoded + "." + payloadEncoded + ".fake-signature"
}

func (ts *TokenOIDCTestSuite) TestGetProviderAppleWithIncorrectIssuer() {
	incorrectIssuer := SetupTestOIDCProvider(ts)
	defer incorrectIssuer.Close()

	ts.Config.External.Apple.Enabled = true
	ts.Config.External.Apple.ClientID = []string{"com.example.app"}

	// Create a token with an invalid issuer
	nonAppleToken := createFakeIDToken(incorrectIssuer.URL, "user123")

	// provider="apple" but with an incorrect issuer in the token
	params := &IdTokenGrantParams{
 IdToken: nonAppleToken,
 Provider: "apple",
 Issuer: incorrectIssuer.URL,
	}

	req := httptest.NewRequest(http.MethodPost, "http://localhost", nil)
	_, _, _, _, _, err := params.getProvider(context.Background(), ts.Config, req)

	require.Error(ts.T(), err)
	require.Contains(ts.T(), err.Error(), "not an Apple ID token issuer")
}

// TestGetProviderAzureWithNonAzureTokenIssuer tests that Azure provider only
// accepts tokens from login.microsoftonline.com and sts.windows.net
func (ts *TokenOIDCTestSuite) TestGetProviderAzureWithNonAzureTokenIssuer() {
	ts.Config.External.Azure.Enabled = true
	ts.Config.External.Azure.ClientID = []string{"test-client-id"}

	// Create a token with an incorrect issuer
	nonAzureIssuer := "https://non-azure-issuer.example.com"
	nonAzureToken := createFakeIDToken(nonAzureIssuer, "user123")

	params := &IdTokenGrantParams{
 IdToken: nonAzureToken,
 Provider: "azure",
 Issuer: nonAzureIssuer,
	}

	req := httptest.NewRequest(http.MethodPost, "http://localhost", nil)
	_, _, _, _, _, err := params.getProvider(context.Background(), ts.Config, req)

	// This should fail - the token's issuer is not an accepted issuer
	require.Error(ts.T(), err)
	require.Contains(ts.T(), err.Error(), "not an Azure ID token issuer")
}

// TestGetProviderAppleWithInvalidIssuerInToken tests that Apple provider rejects
// tokens when the actual token issuer does not match the expected issuer
func (ts *TokenOIDCTestSuite) TestGetProviderAppleWithNonAppleIssuerInToken() {
	ts.Config.External.Apple.Enabled = true
	ts.Config.External.Apple.ClientID = []string{"com.example.app"}

	// Create a token with an incorrect issuer
	nonAppleIssuer := "https://non-apple-issuer.example.com"
	nonAppleToken := createFakeIDToken(nonAppleIssuer, "user123")

	params := &IdTokenGrantParams{
 IdToken: nonAppleToken,
 Provider: "apple",
 Issuer: "https://appleid.apple.com",
	}

	req := httptest.NewRequest(http.MethodPost, "http://localhost", nil)
	_, _, _, _, _, err := params.getProvider(context.Background(), ts.Config, req)

	// This should fail - the token's actual issuer is not appleid.apple.com
	require.Error(ts.T(), err)
	require.Contains(ts.T(), err.Error(), "not an Apple ID token issuer")
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix: additional provider and issuer checks by fadymak · Pull Request #2326 · supabase/auth · GitHub
Skip to content
fix: additional provider and issuer checks#2326

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

fadymak
merged 1 commit into

from

Jan 12, 2026
 Merged


fix: additional provider and issuer checks
#2326
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


49 changes: 31 additions & 18 deletions
internal/api/token_oidc.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import (
	"fmt"
	"net/http"
	"slices"
	"strings"

	"github.com/coreos/go-oidc/v3/oidc"
	"github.com/supabase/auth/internal/api/apierrors"
Expand DownExpand Up@@ -36,23 +37,29 @@ func (p *IdTokenGrantParams) getProvider(ctx context.Context, config *conf.Globa
	var providerType string
	var acceptableClientIDs []string

	if p.Issuer != "" {
 log.WithField("issuer", p.Issuer).WithField("provider", p.Provider).Info("Issuer provided in request.")
	}

	switch true {
	case p.Provider == "apple" || provider.IsAppleIssuer(p.Issuer):
 cfg = &config.External.Apple
 providerType = "apple"
 issuer = p.Issuer
 if issuer == "" {
 detectedIssuer, err := provider.DetectAppleIDTokenIssuer(ctx, p.IdToken)
 if err != nil {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Unable to detect issuer in ID token for Apple provider").WithInternalError(err)
 }

 if provider.IsAppleIssuer(detectedIssuer) {
 issuer = detectedIssuer
 } else {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Detected ID token issuer is not an Apple ID token issuer")
 }
 detectedIssuer, err := provider.DetectAppleIDTokenIssuer(ctx, p.IdToken)
 if err != nil {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Unable to detect issuer in ID token for Apple provider").WithInternalError(err)
 }

 if !provider.IsAppleIssuer(detectedIssuer) {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Detected ID token issuer is not an Apple ID token issuer")
 }

 if p.Issuer != "" && p.Issuer != detectedIssuer {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Provided issuer does not match ID token issuer")
 }

 issuer = detectedIssuer
 acceptableClientIDs = append(acceptableClientIDs, config.External.Apple.ClientID...)

 if config.External.IosBundleId != "" {
Expand All@@ -66,14 +73,20 @@ func (p *IdTokenGrantParams) getProvider(ctx context.Context, config *conf.Globa
 acceptableClientIDs = append(acceptableClientIDs, config.External.Google.ClientID...)

	case p.Provider == "azure" || provider.IsAzureIssuer(p.Issuer):
 issuer = p.Issuer
 if issuer == "" || !provider.IsAzureIssuer(issuer) {
 detectedIssuer, err := provider.DetectAzureIDTokenIssuer(ctx, p.IdToken)
 if err != nil {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Unable to detect issuer in ID token for Azure provider").WithInternalError(err)
 }
 issuer = detectedIssuer
 detectedIssuer, err := provider.DetectAzureIDTokenIssuer(ctx, p.IdToken)
 if err != nil {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Unable to detect issuer in ID token for Azure provider").WithInternalError(err)
 }

 if !strings.HasPrefix(detectedIssuer, "https://login.microsoftonline.com/") && !strings.HasPrefix(detectedIssuer, "https://sts.windows.net/") {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Detected ID token issuer is not an Azure ID token issuer")
 }

 if p.Issuer != "" && p.Issuer != detectedIssuer {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Provided issuer does not match ID token issuer")
 }

 issuer = detectedIssuer
 cfg = &config.External.Azure
 providerType = "azure"
 acceptableClientIDs = append(acceptableClientIDs, config.External.Azure.ClientID...)
Expand Down

100 changes: 100 additions & 0 deletions
internal/api/token_oidc_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,8 @@ package api

import (
	"context"
	"encoding/base64"
	"encoding/json"
	"net/http"
	"net/http/httptest"
	"testing"
Expand DownExpand Up@@ -68,3 +70,101 @@ func (ts *TokenOIDCTestSuite) TestGetProvider() {
	require.Equal(ts.T(), params.Provider, providerType)
	require.NotEmpty(ts.T(), acceptableClientIds)
}

// createFakeIDToken creates a fake JWT token with a specific issuer claim for testing
// WARNING: This is for testing purposes only and creates an unsigned token
func createFakeIDToken(issuer string, sub string) string {
	header := map[string]interface{}{
 "alg": "RS256",
 "typ": "JWT",
	}

	payload := map[string]interface{}{
 "iss": issuer,
 "sub": sub,
 "aud": "test-client-id",
 "exp": 9999999999,
 "iat": 1234567890,
	}

	headerJSON, _ := json.Marshal(header)
	payloadJSON, _ := json.Marshal(payload)

	headerEncoded := base64.RawURLEncoding.EncodeToString(headerJSON)
	payloadEncoded := base64.RawURLEncoding.EncodeToString(payloadJSON)

	// Note: signature is fake, but the issuer detection only looks at the payload
	return headerEncoded + "." + payloadEncoded + ".fake-signature"
}

func (ts *TokenOIDCTestSuite) TestGetProviderAppleWithIncorrectIssuer() {
	incorrectIssuer := SetupTestOIDCProvider(ts)
	defer incorrectIssuer.Close()

	ts.Config.External.Apple.Enabled = true
	ts.Config.External.Apple.ClientID = []string{"com.example.app"}

	// Create a token with an invalid issuer
	nonAppleToken := createFakeIDToken(incorrectIssuer.URL, "user123")

	// provider="apple" but with an incorrect issuer in the token
	params := &IdTokenGrantParams{
 IdToken: nonAppleToken,
 Provider: "apple",
 Issuer: incorrectIssuer.URL,
	}

	req := httptest.NewRequest(http.MethodPost, "http://localhost", nil)
	_, _, _, _, _, err := params.getProvider(context.Background(), ts.Config, req)

	require.Error(ts.T(), err)
	require.Contains(ts.T(), err.Error(), "not an Apple ID token issuer")
}

// TestGetProviderAzureWithNonAzureTokenIssuer tests that Azure provider only
// accepts tokens from login.microsoftonline.com and sts.windows.net
func (ts *TokenOIDCTestSuite) TestGetProviderAzureWithNonAzureTokenIssuer() {
	ts.Config.External.Azure.Enabled = true
	ts.Config.External.Azure.ClientID = []string{"test-client-id"}

	// Create a token with an incorrect issuer
	nonAzureIssuer := "https://non-azure-issuer.example.com"
	nonAzureToken := createFakeIDToken(nonAzureIssuer, "user123")

	params := &IdTokenGrantParams{
 IdToken: nonAzureToken,
 Provider: "azure",
 Issuer: nonAzureIssuer,
	}

	req := httptest.NewRequest(http.MethodPost, "http://localhost", nil)
	_, _, _, _, _, err := params.getProvider(context.Background(), ts.Config, req)

	// This should fail - the token's issuer is not an accepted issuer
	require.Error(ts.T(), err)
	require.Contains(ts.T(), err.Error(), "not an Azure ID token issuer")
}

// TestGetProviderAppleWithInvalidIssuerInToken tests that Apple provider rejects
// tokens when the actual token issuer does not match the expected issuer
func (ts *TokenOIDCTestSuite) TestGetProviderAppleWithNonAppleIssuerInToken() {
	ts.Config.External.Apple.Enabled = true
	ts.Config.External.Apple.ClientID = []string{"com.example.app"}

	// Create a token with an incorrect issuer
	nonAppleIssuer := "https://non-apple-issuer.example.com"
	nonAppleToken := createFakeIDToken(nonAppleIssuer, "user123")

	params := &IdTokenGrantParams{
 IdToken: nonAppleToken,
 Provider: "apple",
 Issuer: "https://appleid.apple.com",
	}

	req := httptest.NewRequest(http.MethodPost, "http://localhost", nil)
	_, _, _, _, _, err := params.getProvider(context.Background(), ts.Config, req)

	// This should fail - the token's actual issuer is not appleid.apple.com
	require.Error(ts.T(), err)
	require.Contains(ts.T(), err.Error(), "not an Apple ID token issuer")
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix: additional provider and issuer checks by fadymak · Pull Request #2326 · supabase/auth · GitHub
Skip to content
fix: additional provider and issuer checks#2326

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

fadymak
merged 1 commit into

from

Jan 12, 2026
 Merged


fix: additional provider and issuer checks
#2326
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


49 changes: 31 additions & 18 deletions
internal/api/token_oidc.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import (
	"fmt"
	"net/http"
	"slices"
	"strings"

	"github.com/coreos/go-oidc/v3/oidc"
	"github.com/supabase/auth/internal/api/apierrors"
Expand DownExpand Up@@ -36,23 +37,29 @@ func (p *IdTokenGrantParams) getProvider(ctx context.Context, config *conf.Globa
	var providerType string
	var acceptableClientIDs []string

	if p.Issuer != "" {
 log.WithField("issuer", p.Issuer).WithField("provider", p.Provider).Info("Issuer provided in request.")
	}

	switch true {
	case p.Provider == "apple" || provider.IsAppleIssuer(p.Issuer):
 cfg = &config.External.Apple
 providerType = "apple"
 issuer = p.Issuer
 if issuer == "" {
 detectedIssuer, err := provider.DetectAppleIDTokenIssuer(ctx, p.IdToken)
 if err != nil {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Unable to detect issuer in ID token for Apple provider").WithInternalError(err)
 }

 if provider.IsAppleIssuer(detectedIssuer) {
 issuer = detectedIssuer
 } else {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Detected ID token issuer is not an Apple ID token issuer")
 }
 detectedIssuer, err := provider.DetectAppleIDTokenIssuer(ctx, p.IdToken)
 if err != nil {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Unable to detect issuer in ID token for Apple provider").WithInternalError(err)
 }

 if !provider.IsAppleIssuer(detectedIssuer) {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Detected ID token issuer is not an Apple ID token issuer")
 }

 if p.Issuer != "" && p.Issuer != detectedIssuer {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Provided issuer does not match ID token issuer")
 }

 issuer = detectedIssuer
 acceptableClientIDs = append(acceptableClientIDs, config.External.Apple.ClientID...)

 if config.External.IosBundleId != "" {
Expand All@@ -66,14 +73,20 @@ func (p *IdTokenGrantParams) getProvider(ctx context.Context, config *conf.Globa
 acceptableClientIDs = append(acceptableClientIDs, config.External.Google.ClientID...)

	case p.Provider == "azure" || provider.IsAzureIssuer(p.Issuer):
 issuer = p.Issuer
 if issuer == "" || !provider.IsAzureIssuer(issuer) {
 detectedIssuer, err := provider.DetectAzureIDTokenIssuer(ctx, p.IdToken)
 if err != nil {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Unable to detect issuer in ID token for Azure provider").WithInternalError(err)
 }
 issuer = detectedIssuer
 detectedIssuer, err := provider.DetectAzureIDTokenIssuer(ctx, p.IdToken)
 if err != nil {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Unable to detect issuer in ID token for Azure provider").WithInternalError(err)
 }

 if !strings.HasPrefix(detectedIssuer, "https://login.microsoftonline.com/") && !strings.HasPrefix(detectedIssuer, "https://sts.windows.net/") {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Detected ID token issuer is not an Azure ID token issuer")
 }

 if p.Issuer != "" && p.Issuer != detectedIssuer {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Provided issuer does not match ID token issuer")
 }

 issuer = detectedIssuer
 cfg = &config.External.Azure
 providerType = "azure"
 acceptableClientIDs = append(acceptableClientIDs, config.External.Azure.ClientID...)
Expand Down

100 changes: 100 additions & 0 deletions
internal/api/token_oidc_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,8 @@ package api

import (
	"context"
	"encoding/base64"
	"encoding/json"
	"net/http"
	"net/http/httptest"
	"testing"
Expand DownExpand Up@@ -68,3 +70,101 @@ func (ts *TokenOIDCTestSuite) TestGetProvider() {
	require.Equal(ts.T(), params.Provider, providerType)
	require.NotEmpty(ts.T(), acceptableClientIds)
}

// createFakeIDToken creates a fake JWT token with a specific issuer claim for testing
// WARNING: This is for testing purposes only and creates an unsigned token
func createFakeIDToken(issuer string, sub string) string {
	header := map[string]interface{}{
 "alg": "RS256",
 "typ": "JWT",
	}

	payload := map[string]interface{}{
 "iss": issuer,
 "sub": sub,
 "aud": "test-client-id",
 "exp": 9999999999,
 "iat": 1234567890,
	}

	headerJSON, _ := json.Marshal(header)
	payloadJSON, _ := json.Marshal(payload)

	headerEncoded := base64.RawURLEncoding.EncodeToString(headerJSON)
	payloadEncoded := base64.RawURLEncoding.EncodeToString(payloadJSON)

	// Note: signature is fake, but the issuer detection only looks at the payload
	return headerEncoded + "." + payloadEncoded + ".fake-signature"
}

func (ts *TokenOIDCTestSuite) TestGetProviderAppleWithIncorrectIssuer() {
	incorrectIssuer := SetupTestOIDCProvider(ts)
	defer incorrectIssuer.Close()

	ts.Config.External.Apple.Enabled = true
	ts.Config.External.Apple.ClientID = []string{"com.example.app"}

	// Create a token with an invalid issuer
	nonAppleToken := createFakeIDToken(incorrectIssuer.URL, "user123")

	// provider="apple" but with an incorrect issuer in the token
	params := &IdTokenGrantParams{
 IdToken: nonAppleToken,
 Provider: "apple",
 Issuer: incorrectIssuer.URL,
	}

	req := httptest.NewRequest(http.MethodPost, "http://localhost", nil)
	_, _, _, _, _, err := params.getProvider(context.Background(), ts.Config, req)

	require.Error(ts.T(), err)
	require.Contains(ts.T(), err.Error(), "not an Apple ID token issuer")
}

// TestGetProviderAzureWithNonAzureTokenIssuer tests that Azure provider only
// accepts tokens from login.microsoftonline.com and sts.windows.net
func (ts *TokenOIDCTestSuite) TestGetProviderAzureWithNonAzureTokenIssuer() {
	ts.Config.External.Azure.Enabled = true
	ts.Config.External.Azure.ClientID = []string{"test-client-id"}

	// Create a token with an incorrect issuer
	nonAzureIssuer := "https://non-azure-issuer.example.com"
	nonAzureToken := createFakeIDToken(nonAzureIssuer, "user123")

	params := &IdTokenGrantParams{
 IdToken: nonAzureToken,
 Provider: "azure",
 Issuer: nonAzureIssuer,
	}

	req := httptest.NewRequest(http.MethodPost, "http://localhost", nil)
	_, _, _, _, _, err := params.getProvider(context.Background(), ts.Config, req)

	// This should fail - the token's issuer is not an accepted issuer
	require.Error(ts.T(), err)
	require.Contains(ts.T(), err.Error(), "not an Azure ID token issuer")
}

// TestGetProviderAppleWithInvalidIssuerInToken tests that Apple provider rejects
// tokens when the actual token issuer does not match the expected issuer
func (ts *TokenOIDCTestSuite) TestGetProviderAppleWithNonAppleIssuerInToken() {
	ts.Config.External.Apple.Enabled = true
	ts.Config.External.Apple.ClientID = []string{"com.example.app"}

	// Create a token with an incorrect issuer
	nonAppleIssuer := "https://non-apple-issuer.example.com"
	nonAppleToken := createFakeIDToken(nonAppleIssuer, "user123")

	params := &IdTokenGrantParams{
 IdToken: nonAppleToken,
 Provider: "apple",
 Issuer: "https://appleid.apple.com",
	}

	req := httptest.NewRequest(http.MethodPost, "http://localhost", nil)
	_, _, _, _, _, err := params.getProvider(context.Background(), ts.Config, req)

	// This should fail - the token's actual issuer is not appleid.apple.com
	require.Error(ts.T(), err)
	require.Contains(ts.T(), err.Error(), "not an Apple ID token issuer")
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
fix: additional provider and issuer checks by fadymak · Pull Request #2326 · supabase/auth · GitHub
Skip to content
fix: additional provider and issuer checks#2326

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

fadymak
merged 1 commit into

from

Jan 12, 2026
 Merged


fix: additional provider and issuer checks
#2326
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


49 changes: 31 additions & 18 deletions
internal/api/token_oidc.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import (
	"fmt"
	"net/http"
	"slices"
	"strings"

	"github.com/coreos/go-oidc/v3/oidc"
	"github.com/supabase/auth/internal/api/apierrors"
Expand DownExpand Up@@ -36,23 +37,29 @@ func (p *IdTokenGrantParams) getProvider(ctx context.Context, config *conf.Globa
	var providerType string
	var acceptableClientIDs []string

	if p.Issuer != "" {
 log.WithField("issuer", p.Issuer).WithField("provider", p.Provider).Info("Issuer provided in request.")
	}

	switch true {
	case p.Provider == "apple" || provider.IsAppleIssuer(p.Issuer):
 cfg = &config.External.Apple
 providerType = "apple"
 issuer = p.Issuer
 if issuer == "" {
 detectedIssuer, err := provider.DetectAppleIDTokenIssuer(ctx, p.IdToken)
 if err != nil {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Unable to detect issuer in ID token for Apple provider").WithInternalError(err)
 }

 if provider.IsAppleIssuer(detectedIssuer) {
 issuer = detectedIssuer
 } else {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Detected ID token issuer is not an Apple ID token issuer")
 }
 detectedIssuer, err := provider.DetectAppleIDTokenIssuer(ctx, p.IdToken)
 if err != nil {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Unable to detect issuer in ID token for Apple provider").WithInternalError(err)
 }

 if !provider.IsAppleIssuer(detectedIssuer) {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Detected ID token issuer is not an Apple ID token issuer")
 }

 if p.Issuer != "" && p.Issuer != detectedIssuer {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Provided issuer does not match ID token issuer")
 }

 issuer = detectedIssuer
 acceptableClientIDs = append(acceptableClientIDs, config.External.Apple.ClientID...)

 if config.External.IosBundleId != "" {
Expand All@@ -66,14 +73,20 @@ func (p *IdTokenGrantParams) getProvider(ctx context.Context, config *conf.Globa
 acceptableClientIDs = append(acceptableClientIDs, config.External.Google.ClientID...)

	case p.Provider == "azure" || provider.IsAzureIssuer(p.Issuer):
 issuer = p.Issuer
 if issuer == "" || !provider.IsAzureIssuer(issuer) {
 detectedIssuer, err := provider.DetectAzureIDTokenIssuer(ctx, p.IdToken)
 if err != nil {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Unable to detect issuer in ID token for Azure provider").WithInternalError(err)
 }
 issuer = detectedIssuer
 detectedIssuer, err := provider.DetectAzureIDTokenIssuer(ctx, p.IdToken)
 if err != nil {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Unable to detect issuer in ID token for Azure provider").WithInternalError(err)
 }

 if !strings.HasPrefix(detectedIssuer, "https://login.microsoftonline.com/") && !strings.HasPrefix(detectedIssuer, "https://sts.windows.net/") {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Detected ID token issuer is not an Azure ID token issuer")
 }

 if p.Issuer != "" && p.Issuer != detectedIssuer {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Provided issuer does not match ID token issuer")
 }

 issuer = detectedIssuer
 cfg = &config.External.Azure
 providerType = "azure"
 acceptableClientIDs = append(acceptableClientIDs, config.External.Azure.ClientID...)
Expand Down

100 changes: 100 additions & 0 deletions
internal/api/token_oidc_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,8 @@ package api

import (
	"context"
	"encoding/base64"
	"encoding/json"
	"net/http"
	"net/http/httptest"
	"testing"
Expand DownExpand Up@@ -68,3 +70,101 @@ func (ts *TokenOIDCTestSuite) TestGetProvider() {
	require.Equal(ts.T(), params.Provider, providerType)
	require.NotEmpty(ts.T(), acceptableClientIds)
}

// createFakeIDToken creates a fake JWT token with a specific issuer claim for testing
// WARNING: This is for testing purposes only and creates an unsigned token
func createFakeIDToken(issuer string, sub string) string {
	header := map[string]interface{}{
 "alg": "RS256",
 "typ": "JWT",
	}

	payload := map[string]interface{}{
 "iss": issuer,
 "sub": sub,
 "aud": "test-client-id",
 "exp": 9999999999,
 "iat": 1234567890,
	}

	headerJSON, _ := json.Marshal(header)
	payloadJSON, _ := json.Marshal(payload)

	headerEncoded := base64.RawURLEncoding.EncodeToString(headerJSON)
	payloadEncoded := base64.RawURLEncoding.EncodeToString(payloadJSON)

	// Note: signature is fake, but the issuer detection only looks at the payload
	return headerEncoded + "." + payloadEncoded + ".fake-signature"
}

func (ts *TokenOIDCTestSuite) TestGetProviderAppleWithIncorrectIssuer() {
	incorrectIssuer := SetupTestOIDCProvider(ts)
	defer incorrectIssuer.Close()

	ts.Config.External.Apple.Enabled = true
	ts.Config.External.Apple.ClientID = []string{"com.example.app"}

	// Create a token with an invalid issuer
	nonAppleToken := createFakeIDToken(incorrectIssuer.URL, "user123")

	// provider="apple" but with an incorrect issuer in the token
	params := &IdTokenGrantParams{
 IdToken: nonAppleToken,
 Provider: "apple",
 Issuer: incorrectIssuer.URL,
	}

	req := httptest.NewRequest(http.MethodPost, "http://localhost", nil)
	_, _, _, _, _, err := params.getProvider(context.Background(), ts.Config, req)

	require.Error(ts.T(), err)
	require.Contains(ts.T(), err.Error(), "not an Apple ID token issuer")
}

// TestGetProviderAzureWithNonAzureTokenIssuer tests that Azure provider only
// accepts tokens from login.microsoftonline.com and sts.windows.net
func (ts *TokenOIDCTestSuite) TestGetProviderAzureWithNonAzureTokenIssuer() {
	ts.Config.External.Azure.Enabled = true
	ts.Config.External.Azure.ClientID = []string{"test-client-id"}

	// Create a token with an incorrect issuer
	nonAzureIssuer := "https://non-azure-issuer.example.com"
	nonAzureToken := createFakeIDToken(nonAzureIssuer, "user123")

	params := &IdTokenGrantParams{
 IdToken: nonAzureToken,
 Provider: "azure",
 Issuer: nonAzureIssuer,
	}

	req := httptest.NewRequest(http.MethodPost, "http://localhost", nil)
	_, _, _, _, _, err := params.getProvider(context.Background(), ts.Config, req)

	// This should fail - the token's issuer is not an accepted issuer
	require.Error(ts.T(), err)
	require.Contains(ts.T(), err.Error(), "not an Azure ID token issuer")
}

// TestGetProviderAppleWithInvalidIssuerInToken tests that Apple provider rejects
// tokens when the actual token issuer does not match the expected issuer
func (ts *TokenOIDCTestSuite) TestGetProviderAppleWithNonAppleIssuerInToken() {
	ts.Config.External.Apple.Enabled = true
	ts.Config.External.Apple.ClientID = []string{"com.example.app"}

	// Create a token with an incorrect issuer
	nonAppleIssuer := "https://non-apple-issuer.example.com"
	nonAppleToken := createFakeIDToken(nonAppleIssuer, "user123")

	params := &IdTokenGrantParams{
 IdToken: nonAppleToken,
 Provider: "apple",
 Issuer: "https://appleid.apple.com",
	}

	req := httptest.NewRequest(http.MethodPost, "http://localhost", nil)
	_, _, _, _, _, err := params.getProvider(context.Background(), ts.Config, req)

	// This should fail - the token's actual issuer is not appleid.apple.com
	require.Error(ts.T(), err)
	require.Contains(ts.T(), err.Error(), "not an Apple ID token issuer")
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix: additional provider and issuer checks by fadymak · Pull Request #2326 · supabase/auth · GitHub
Skip to content
fix: additional provider and issuer checks#2326

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

fadymak
merged 1 commit into

from

Jan 12, 2026
 Merged


fix: additional provider and issuer checks
#2326
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


49 changes: 31 additions & 18 deletions
internal/api/token_oidc.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import (
	"fmt"
	"net/http"
	"slices"
	"strings"

	"github.com/coreos/go-oidc/v3/oidc"
	"github.com/supabase/auth/internal/api/apierrors"
Expand DownExpand Up@@ -36,23 +37,29 @@ func (p *IdTokenGrantParams) getProvider(ctx context.Context, config *conf.Globa
	var providerType string
	var acceptableClientIDs []string

	if p.Issuer != "" {
 log.WithField("issuer", p.Issuer).WithField("provider", p.Provider).Info("Issuer provided in request.")
	}

	switch true {
	case p.Provider == "apple" || provider.IsAppleIssuer(p.Issuer):
 cfg = &config.External.Apple
 providerType = "apple"
 issuer = p.Issuer
 if issuer == "" {
 detectedIssuer, err := provider.DetectAppleIDTokenIssuer(ctx, p.IdToken)
 if err != nil {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Unable to detect issuer in ID token for Apple provider").WithInternalError(err)
 }

 if provider.IsAppleIssuer(detectedIssuer) {
 issuer = detectedIssuer
 } else {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Detected ID token issuer is not an Apple ID token issuer")
 }
 detectedIssuer, err := provider.DetectAppleIDTokenIssuer(ctx, p.IdToken)
 if err != nil {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Unable to detect issuer in ID token for Apple provider").WithInternalError(err)
 }

 if !provider.IsAppleIssuer(detectedIssuer) {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Detected ID token issuer is not an Apple ID token issuer")
 }

 if p.Issuer != "" && p.Issuer != detectedIssuer {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Provided issuer does not match ID token issuer")
 }

 issuer = detectedIssuer
 acceptableClientIDs = append(acceptableClientIDs, config.External.Apple.ClientID...)

 if config.External.IosBundleId != "" {
Expand All@@ -66,14 +73,20 @@ func (p *IdTokenGrantParams) getProvider(ctx context.Context, config *conf.Globa
 acceptableClientIDs = append(acceptableClientIDs, config.External.Google.ClientID...)

	case p.Provider == "azure" || provider.IsAzureIssuer(p.Issuer):
 issuer = p.Issuer
 if issuer == "" || !provider.IsAzureIssuer(issuer) {
 detectedIssuer, err := provider.DetectAzureIDTokenIssuer(ctx, p.IdToken)
 if err != nil {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Unable to detect issuer in ID token for Azure provider").WithInternalError(err)
 }
 issuer = detectedIssuer
 detectedIssuer, err := provider.DetectAzureIDTokenIssuer(ctx, p.IdToken)
 if err != nil {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Unable to detect issuer in ID token for Azure provider").WithInternalError(err)
 }

 if !strings.HasPrefix(detectedIssuer, "https://login.microsoftonline.com/") && !strings.HasPrefix(detectedIssuer, "https://sts.windows.net/") {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Detected ID token issuer is not an Azure ID token issuer")
 }

 if p.Issuer != "" && p.Issuer != detectedIssuer {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Provided issuer does not match ID token issuer")
 }

 issuer = detectedIssuer
 cfg = &config.External.Azure
 providerType = "azure"
 acceptableClientIDs = append(acceptableClientIDs, config.External.Azure.ClientID...)
Expand Down

100 changes: 100 additions & 0 deletions
internal/api/token_oidc_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,8 @@ package api

import (
	"context"
	"encoding/base64"
	"encoding/json"
	"net/http"
	"net/http/httptest"
	"testing"
Expand DownExpand Up@@ -68,3 +70,101 @@ func (ts *TokenOIDCTestSuite) TestGetProvider() {
	require.Equal(ts.T(), params.Provider, providerType)
	require.NotEmpty(ts.T(), acceptableClientIds)
}

// createFakeIDToken creates a fake JWT token with a specific issuer claim for testing
// WARNING: This is for testing purposes only and creates an unsigned token
func createFakeIDToken(issuer string, sub string) string {
	header := map[string]interface{}{
 "alg": "RS256",
 "typ": "JWT",
	}

	payload := map[string]interface{}{
 "iss": issuer,
 "sub": sub,
 "aud": "test-client-id",
 "exp": 9999999999,
 "iat": 1234567890,
	}

	headerJSON, _ := json.Marshal(header)
	payloadJSON, _ := json.Marshal(payload)

	headerEncoded := base64.RawURLEncoding.EncodeToString(headerJSON)
	payloadEncoded := base64.RawURLEncoding.EncodeToString(payloadJSON)

	// Note: signature is fake, but the issuer detection only looks at the payload
	return headerEncoded + "." + payloadEncoded + ".fake-signature"
}

func (ts *TokenOIDCTestSuite) TestGetProviderAppleWithIncorrectIssuer() {
	incorrectIssuer := SetupTestOIDCProvider(ts)
	defer incorrectIssuer.Close()

	ts.Config.External.Apple.Enabled = true
	ts.Config.External.Apple.ClientID = []string{"com.example.app"}

	// Create a token with an invalid issuer
	nonAppleToken := createFakeIDToken(incorrectIssuer.URL, "user123")

	// provider="apple" but with an incorrect issuer in the token
	params := &IdTokenGrantParams{
 IdToken: nonAppleToken,
 Provider: "apple",
 Issuer: incorrectIssuer.URL,
	}

	req := httptest.NewRequest(http.MethodPost, "http://localhost", nil)
	_, _, _, _, _, err := params.getProvider(context.Background(), ts.Config, req)

	require.Error(ts.T(), err)
	require.Contains(ts.T(), err.Error(), "not an Apple ID token issuer")
}

// TestGetProviderAzureWithNonAzureTokenIssuer tests that Azure provider only
// accepts tokens from login.microsoftonline.com and sts.windows.net
func (ts *TokenOIDCTestSuite) TestGetProviderAzureWithNonAzureTokenIssuer() {
	ts.Config.External.Azure.Enabled = true
	ts.Config.External.Azure.ClientID = []string{"test-client-id"}

	// Create a token with an incorrect issuer
	nonAzureIssuer := "https://non-azure-issuer.example.com"
	nonAzureToken := createFakeIDToken(nonAzureIssuer, "user123")

	params := &IdTokenGrantParams{
 IdToken: nonAzureToken,
 Provider: "azure",
 Issuer: nonAzureIssuer,
	}

	req := httptest.NewRequest(http.MethodPost, "http://localhost", nil)
	_, _, _, _, _, err := params.getProvider(context.Background(), ts.Config, req)

	// This should fail - the token's issuer is not an accepted issuer
	require.Error(ts.T(), err)
	require.Contains(ts.T(), err.Error(), "not an Azure ID token issuer")
}

// TestGetProviderAppleWithInvalidIssuerInToken tests that Apple provider rejects
// tokens when the actual token issuer does not match the expected issuer
func (ts *TokenOIDCTestSuite) TestGetProviderAppleWithNonAppleIssuerInToken() {
	ts.Config.External.Apple.Enabled = true
	ts.Config.External.Apple.ClientID = []string{"com.example.app"}

	// Create a token with an incorrect issuer
	nonAppleIssuer := "https://non-apple-issuer.example.com"
	nonAppleToken := createFakeIDToken(nonAppleIssuer, "user123")

	params := &IdTokenGrantParams{
 IdToken: nonAppleToken,
 Provider: "apple",
 Issuer: "https://appleid.apple.com",
	}

	req := httptest.NewRequest(http.MethodPost, "http://localhost", nil)
	_, _, _, _, _, err := params.getProvider(context.Background(), ts.Config, req)

	// This should fail - the token's actual issuer is not appleid.apple.com
	require.Error(ts.T(), err)
	require.Contains(ts.T(), err.Error(), "not an Apple ID token issuer")
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix: additional provider and issuer checks by fadymak · Pull Request #2326 · supabase/auth · GitHub
Skip to content
fix: additional provider and issuer checks#2326

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

fadymak
merged 1 commit into

from

Jan 12, 2026
 Merged


fix: additional provider and issuer checks
#2326
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


49 changes: 31 additions & 18 deletions
internal/api/token_oidc.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import (
	"fmt"
	"net/http"
	"slices"
	"strings"

	"github.com/coreos/go-oidc/v3/oidc"
	"github.com/supabase/auth/internal/api/apierrors"
Expand DownExpand Up@@ -36,23 +37,29 @@ func (p *IdTokenGrantParams) getProvider(ctx context.Context, config *conf.Globa
	var providerType string
	var acceptableClientIDs []string

	if p.Issuer != "" {
 log.WithField("issuer", p.Issuer).WithField("provider", p.Provider).Info("Issuer provided in request.")
	}

	switch true {
	case p.Provider == "apple" || provider.IsAppleIssuer(p.Issuer):
 cfg = &config.External.Apple
 providerType = "apple"
 issuer = p.Issuer
 if issuer == "" {
 detectedIssuer, err := provider.DetectAppleIDTokenIssuer(ctx, p.IdToken)
 if err != nil {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Unable to detect issuer in ID token for Apple provider").WithInternalError(err)
 }

 if provider.IsAppleIssuer(detectedIssuer) {
 issuer = detectedIssuer
 } else {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Detected ID token issuer is not an Apple ID token issuer")
 }
 detectedIssuer, err := provider.DetectAppleIDTokenIssuer(ctx, p.IdToken)
 if err != nil {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Unable to detect issuer in ID token for Apple provider").WithInternalError(err)
 }

 if !provider.IsAppleIssuer(detectedIssuer) {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Detected ID token issuer is not an Apple ID token issuer")
 }

 if p.Issuer != "" && p.Issuer != detectedIssuer {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Provided issuer does not match ID token issuer")
 }

 issuer = detectedIssuer
 acceptableClientIDs = append(acceptableClientIDs, config.External.Apple.ClientID...)

 if config.External.IosBundleId != "" {
Expand All@@ -66,14 +73,20 @@ func (p *IdTokenGrantParams) getProvider(ctx context.Context, config *conf.Globa
 acceptableClientIDs = append(acceptableClientIDs, config.External.Google.ClientID...)

	case p.Provider == "azure" || provider.IsAzureIssuer(p.Issuer):
 issuer = p.Issuer
 if issuer == "" || !provider.IsAzureIssuer(issuer) {
 detectedIssuer, err := provider.DetectAzureIDTokenIssuer(ctx, p.IdToken)
 if err != nil {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Unable to detect issuer in ID token for Azure provider").WithInternalError(err)
 }
 issuer = detectedIssuer
 detectedIssuer, err := provider.DetectAzureIDTokenIssuer(ctx, p.IdToken)
 if err != nil {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Unable to detect issuer in ID token for Azure provider").WithInternalError(err)
 }

 if !strings.HasPrefix(detectedIssuer, "https://login.microsoftonline.com/") && !strings.HasPrefix(detectedIssuer, "https://sts.windows.net/") {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Detected ID token issuer is not an Azure ID token issuer")
 }

 if p.Issuer != "" && p.Issuer != detectedIssuer {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Provided issuer does not match ID token issuer")
 }

 issuer = detectedIssuer
 cfg = &config.External.Azure
 providerType = "azure"
 acceptableClientIDs = append(acceptableClientIDs, config.External.Azure.ClientID...)
Expand Down

100 changes: 100 additions & 0 deletions
internal/api/token_oidc_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,8 @@ package api

import (
	"context"
	"encoding/base64"
	"encoding/json"
	"net/http"
	"net/http/httptest"
	"testing"
Expand DownExpand Up@@ -68,3 +70,101 @@ func (ts *TokenOIDCTestSuite) TestGetProvider() {
	require.Equal(ts.T(), params.Provider, providerType)
	require.NotEmpty(ts.T(), acceptableClientIds)
}

// createFakeIDToken creates a fake JWT token with a specific issuer claim for testing
// WARNING: This is for testing purposes only and creates an unsigned token
func createFakeIDToken(issuer string, sub string) string {
	header := map[string]interface{}{
 "alg": "RS256",
 "typ": "JWT",
	}

	payload := map[string]interface{}{
 "iss": issuer,
 "sub": sub,
 "aud": "test-client-id",
 "exp": 9999999999,
 "iat": 1234567890,
	}

	headerJSON, _ := json.Marshal(header)
	payloadJSON, _ := json.Marshal(payload)

	headerEncoded := base64.RawURLEncoding.EncodeToString(headerJSON)
	payloadEncoded := base64.RawURLEncoding.EncodeToString(payloadJSON)

	// Note: signature is fake, but the issuer detection only looks at the payload
	return headerEncoded + "." + payloadEncoded + ".fake-signature"
}

func (ts *TokenOIDCTestSuite) TestGetProviderAppleWithIncorrectIssuer() {
	incorrectIssuer := SetupTestOIDCProvider(ts)
	defer incorrectIssuer.Close()

	ts.Config.External.Apple.Enabled = true
	ts.Config.External.Apple.ClientID = []string{"com.example.app"}

	// Create a token with an invalid issuer
	nonAppleToken := createFakeIDToken(incorrectIssuer.URL, "user123")

	// provider="apple" but with an incorrect issuer in the token
	params := &IdTokenGrantParams{
 IdToken: nonAppleToken,
 Provider: "apple",
 Issuer: incorrectIssuer.URL,
	}

	req := httptest.NewRequest(http.MethodPost, "http://localhost", nil)
	_, _, _, _, _, err := params.getProvider(context.Background(), ts.Config, req)

	require.Error(ts.T(), err)
	require.Contains(ts.T(), err.Error(), "not an Apple ID token issuer")
}

// TestGetProviderAzureWithNonAzureTokenIssuer tests that Azure provider only
// accepts tokens from login.microsoftonline.com and sts.windows.net
func (ts *TokenOIDCTestSuite) TestGetProviderAzureWithNonAzureTokenIssuer() {
	ts.Config.External.Azure.Enabled = true
	ts.Config.External.Azure.ClientID = []string{"test-client-id"}

	// Create a token with an incorrect issuer
	nonAzureIssuer := "https://non-azure-issuer.example.com"
	nonAzureToken := createFakeIDToken(nonAzureIssuer, "user123")

	params := &IdTokenGrantParams{
 IdToken: nonAzureToken,
 Provider: "azure",
 Issuer: nonAzureIssuer,
	}

	req := httptest.NewRequest(http.MethodPost, "http://localhost", nil)
	_, _, _, _, _, err := params.getProvider(context.Background(), ts.Config, req)

	// This should fail - the token's issuer is not an accepted issuer
	require.Error(ts.T(), err)
	require.Contains(ts.T(), err.Error(), "not an Azure ID token issuer")
}

// TestGetProviderAppleWithInvalidIssuerInToken tests that Apple provider rejects
// tokens when the actual token issuer does not match the expected issuer
func (ts *TokenOIDCTestSuite) TestGetProviderAppleWithNonAppleIssuerInToken() {
	ts.Config.External.Apple.Enabled = true
	ts.Config.External.Apple.ClientID = []string{"com.example.app"}

	// Create a token with an incorrect issuer
	nonAppleIssuer := "https://non-apple-issuer.example.com"
	nonAppleToken := createFakeIDToken(nonAppleIssuer, "user123")

	params := &IdTokenGrantParams{
 IdToken: nonAppleToken,
 Provider: "apple",
 Issuer: "https://appleid.apple.com",
	}

	req := httptest.NewRequest(http.MethodPost, "http://localhost", nil)
	_, _, _, _, _, err := params.getProvider(context.Background(), ts.Config, req)

	// This should fail - the token's actual issuer is not appleid.apple.com
	require.Error(ts.T(), err)
	require.Contains(ts.T(), err.Error(), "not an Apple ID token issuer")
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
fix: additional provider and issuer checks by fadymak · Pull Request #2326 · supabase/auth · GitHub
Skip to content
fix: additional provider and issuer checks#2326

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

fadymak
merged 1 commit into

from

Jan 12, 2026
 Merged


fix: additional provider and issuer checks
#2326
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


49 changes: 31 additions & 18 deletions
internal/api/token_oidc.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import (
	"fmt"
	"net/http"
	"slices"
	"strings"

	"github.com/coreos/go-oidc/v3/oidc"
	"github.com/supabase/auth/internal/api/apierrors"
Expand DownExpand Up@@ -36,23 +37,29 @@ func (p *IdTokenGrantParams) getProvider(ctx context.Context, config *conf.Globa
	var providerType string
	var acceptableClientIDs []string

	if p.Issuer != "" {
 log.WithField("issuer", p.Issuer).WithField("provider", p.Provider).Info("Issuer provided in request.")
	}

	switch true {
	case p.Provider == "apple" || provider.IsAppleIssuer(p.Issuer):
 cfg = &config.External.Apple
 providerType = "apple"
 issuer = p.Issuer
 if issuer == "" {
 detectedIssuer, err := provider.DetectAppleIDTokenIssuer(ctx, p.IdToken)
 if err != nil {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Unable to detect issuer in ID token for Apple provider").WithInternalError(err)
 }

 if provider.IsAppleIssuer(detectedIssuer) {
 issuer = detectedIssuer
 } else {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Detected ID token issuer is not an Apple ID token issuer")
 }
 detectedIssuer, err := provider.DetectAppleIDTokenIssuer(ctx, p.IdToken)
 if err != nil {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Unable to detect issuer in ID token for Apple provider").WithInternalError(err)
 }

 if !provider.IsAppleIssuer(detectedIssuer) {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Detected ID token issuer is not an Apple ID token issuer")
 }

 if p.Issuer != "" && p.Issuer != detectedIssuer {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Provided issuer does not match ID token issuer")
 }

 issuer = detectedIssuer
 acceptableClientIDs = append(acceptableClientIDs, config.External.Apple.ClientID...)

 if config.External.IosBundleId != "" {
Expand All@@ -66,14 +73,20 @@ func (p *IdTokenGrantParams) getProvider(ctx context.Context, config *conf.Globa
 acceptableClientIDs = append(acceptableClientIDs, config.External.Google.ClientID...)

	case p.Provider == "azure" || provider.IsAzureIssuer(p.Issuer):
 issuer = p.Issuer
 if issuer == "" || !provider.IsAzureIssuer(issuer) {
 detectedIssuer, err := provider.DetectAzureIDTokenIssuer(ctx, p.IdToken)
 if err != nil {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Unable to detect issuer in ID token for Azure provider").WithInternalError(err)
 }
 issuer = detectedIssuer
 detectedIssuer, err := provider.DetectAzureIDTokenIssuer(ctx, p.IdToken)
 if err != nil {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Unable to detect issuer in ID token for Azure provider").WithInternalError(err)
 }

 if !strings.HasPrefix(detectedIssuer, "https://login.microsoftonline.com/") && !strings.HasPrefix(detectedIssuer, "https://sts.windows.net/") {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Detected ID token issuer is not an Azure ID token issuer")
 }

 if p.Issuer != "" && p.Issuer != detectedIssuer {
 return nil, false, "", nil, false, apierrors.NewBadRequestError(apierrors.ErrorCodeValidationFailed, "Provided issuer does not match ID token issuer")
 }

 issuer = detectedIssuer
 cfg = &config.External.Azure
 providerType = "azure"
 acceptableClientIDs = append(acceptableClientIDs, config.External.Azure.ClientID...)
Expand Down

100 changes: 100 additions & 0 deletions
internal/api/token_oidc_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,8 @@ package api

import (
	"context"
	"encoding/base64"
	"encoding/json"
	"net/http"
	"net/http/httptest"
	"testing"
Expand DownExpand Up@@ -68,3 +70,101 @@ func (ts *TokenOIDCTestSuite) TestGetProvider() {
	require.Equal(ts.T(), params.Provider, providerType)
	require.NotEmpty(ts.T(), acceptableClientIds)
}

// createFakeIDToken creates a fake JWT token with a specific issuer claim for testing
// WARNING: This is for testing purposes only and creates an unsigned token
func createFakeIDToken(issuer string, sub string) string {
	header := map[string]interface{}{
 "alg": "RS256",
 "typ": "JWT",
	}

	payload := map[string]interface{}{
 "iss": issuer,
 "sub": sub,
 "aud": "test-client-id",
 "exp": 9999999999,
 "iat": 1234567890,
	}

	headerJSON, _ := json.Marshal(header)
	payloadJSON, _ := json.Marshal(payload)

	headerEncoded := base64.RawURLEncoding.EncodeToString(headerJSON)
	payloadEncoded := base64.RawURLEncoding.EncodeToString(payloadJSON)

	// Note: signature is fake, but the issuer detection only looks at the payload
	return headerEncoded + "." + payloadEncoded + ".fake-signature"
}

func (ts *TokenOIDCTestSuite) TestGetProviderAppleWithIncorrectIssuer() {
	incorrectIssuer := SetupTestOIDCProvider(ts)
	defer incorrectIssuer.Close()

	ts.Config.External.Apple.Enabled = true
	ts.Config.External.Apple.ClientID = []string{"com.example.app"}

	// Create a token with an invalid issuer
	nonAppleToken := createFakeIDToken(incorrectIssuer.URL, "user123")

	// provider="apple" but with an incorrect issuer in the token
	params := &IdTokenGrantParams{
 IdToken: nonAppleToken,
 Provider: "apple",
 Issuer: incorrectIssuer.URL,
	}

	req := httptest.NewRequest(http.MethodPost, "http://localhost", nil)
	_, _, _, _, _, err := params.getProvider(context.Background(), ts.Config, req)

	require.Error(ts.T(), err)
	require.Contains(ts.T(), err.Error(), "not an Apple ID token issuer")
}

// TestGetProviderAzureWithNonAzureTokenIssuer tests that Azure provider only
// accepts tokens from login.microsoftonline.com and sts.windows.net
func (ts *TokenOIDCTestSuite) TestGetProviderAzureWithNonAzureTokenIssuer() {
	ts.Config.External.Azure.Enabled = true
	ts.Config.External.Azure.ClientID = []string{"test-client-id"}

	// Create a token with an incorrect issuer
	nonAzureIssuer := "https://non-azure-issuer.example.com"
	nonAzureToken := createFakeIDToken(nonAzureIssuer, "user123")

	params := &IdTokenGrantParams{
 IdToken: nonAzureToken,
 Provider: "azure",
 Issuer: nonAzureIssuer,
	}

	req := httptest.NewRequest(http.MethodPost, "http://localhost", nil)
	_, _, _, _, _, err := params.getProvider(context.Background(), ts.Config, req)

	// This should fail - the token's issuer is not an accepted issuer
	require.Error(ts.T(), err)
	require.Contains(ts.T(), err.Error(), "not an Azure ID token issuer")
}

// TestGetProviderAppleWithInvalidIssuerInToken tests that Apple provider rejects
// tokens when the actual token issuer does not match the expected issuer
func (ts *TokenOIDCTestSuite) TestGetProviderAppleWithNonAppleIssuerInToken() {
	ts.Config.External.Apple.Enabled = true
	ts.Config.External.Apple.ClientID = []string{"com.example.app"}

	// Create a token with an incorrect issuer
	nonAppleIssuer := "https://non-apple-issuer.example.com"
	nonAppleToken := createFakeIDToken(nonAppleIssuer, "user123")

	params := &IdTokenGrantParams{
 IdToken: nonAppleToken,
 Provider: "apple",
 Issuer: "https://appleid.apple.com",
	}

	req := httptest.NewRequest(http.MethodPost, "http://localhost", nil)
	_, _, _, _, _, err := params.getProvider(context.Background(), ts.Config, req)

	// This should fail - the token's actual issuer is not appleid.apple.com
	require.Error(ts.T(), err)
	require.Contains(ts.T(), err.Error(), "not an Apple ID token issuer")
}