Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

feature: trust custom oauth providers in order to create un-invited users in private mode (#1068)

Guilherme Oenning3b794edbd978
diff --git a/app/actions/oauth.go b/app/actions/oauth.go
index 17bb43f6c..3160f164d 100644
--- a/app/actions/oauth.go
+++ b/app/actions/oauth.go
@@ -2,9 +2,10 @@ package actions
import (
"context"
- "github.com/getfider/fider/app"
"strings"
+ "github.com/getfider/fider/app"
+
"github.com/getfider/fider/app/models/dto"
"github.com/getfider/fider/app/models/entity"
"github.com/getfider/fider/app/models/enum"
@@ -28,6 +29,7 @@ type CreateEditOAuthConfig struct {
TokenURL string `json:"tokenURL"`
Scope string `json:"scope"`
ProfileURL string `json:"profileURL"`
+ IsTrusted bool `json:"isTrusted"`
JSONUserIDPath string `json:"jsonUserIDPath"`
JSONUserNamePath string `json:"jsonUserNamePath"`
JSONUserEmailPath string `json:"jsonUserEmailPath"`
diff --git a/app/actions/oauth_test.go b/app/actions/oauth_test.go
index d93ff6bad..5eb05f72a 100644
--- a/app/actions/oauth_test.go
+++ b/app/actions/oauth_test.go
@@ -2,9 +2,10 @@ package actions_test
import (
"context"
- "github.com/getfider/fider/app/models/dto"
"testing"
+ "github.com/getfider/fider/app/models/dto"
+
"github.com/getfider/fider/app"
"github.com/getfider/fider/app/actions"
"github.com/getfider/fider/app/models/entity"
diff --git a/app/handlers/admin.go b/app/handlers/admin.go
index 7a48780a2..9bdae3174 100644
--- a/app/handlers/admin.go
+++ b/app/handlers/admin.go
@@ -193,6 +193,7 @@ func SaveOAuthConfig() web.HandlerFunc {
TokenURL: action.TokenURL,
Scope: action.Scope,
ProfileURL: action.ProfileURL,
+ IsTrusted: action.IsTrusted,
JSONUserIDPath: action.JSONUserIDPath,
JSONUserNamePath: action.JSONUserNamePath,
JSONUserEmailPath: action.JSONUserEmailPath,
diff --git a/app/handlers/oauth.go b/app/handlers/oauth.go
index 4058c4896..c6baba096 100644
--- a/app/handlers/oauth.go
+++ b/app/handlers/oauth.go
@@ -1,6 +1,7 @@
package handlers
import (
+ "context"
"fmt"
"net/http"
"net/url"
@@ -102,7 +103,8 @@ func OAuthToken() web.HandlerFunc {
}
if err != nil {
if errors.Cause(err) == app.ErrNotFound {
- if c.Tenant().IsPrivate {
+ isTrusted := isTrustedOAuthProvider(c, provider)
+ if c.Tenant().IsPrivate && !isTrusted {
return c.Redirect("/not-invited")
}
@@ -141,6 +143,15 @@ func OAuthToken() web.HandlerFunc {
}
}
+func isTrustedOAuthProvider(ctx context.Context, provider string) bool {
+ customOAuthConfigByProvider := &query.GetCustomOAuthConfigByProvider{Provider: provider}
+ err := bus.Dispatch(ctx, customOAuthConfigByProvider)
+ if err != nil {
+ return false
+ }
+ return customOAuthConfigByProvider.Result.IsTrusted
+}
+
// OAuthCallback handles the redirect back from the OAuth provider
// This callback can run on either Tenant or Login address
// If the request is for a sign in, we redirect the user to the tenant address
diff --git a/app/handlers/oauth_test.go b/app/handlers/oauth_test.go
index 1da5e4797..c185aaf02 100644
--- a/app/handlers/oauth_test.go
+++ b/app/handlers/oauth_test.go
@@ -6,6 +6,7 @@ import (
"github.com/getfider/fider/app/models/dto"
"github.com/getfider/fider/app/models/entity"
+ "github.com/getfider/fider/app/models/enum"
"github.com/getfider/fider/app/services/oauth"
@@ -227,23 +228,31 @@ func TestOAuthTokenHandler_NewUser(t *testing.T) {
})
bus.AddHandler(func(ctx context.Context, q *query.GetUserByProvider) error {
+ Expect(q.Provider).Equals(app.FacebookProvider)
+ Expect(q.UID).Equals("FB456")
return app.ErrNotFound
})
bus.AddHandler(func(ctx context.Context, q *query.GetUserByEmail) error {
+ Expect(q.Email).Equals("[email protected]")
+ return app.ErrNotFound
+ })
+
+ bus.AddHandler(func(ctx context.Context, q *query.GetCustomOAuthConfigByProvider) error {
+ Expect(q.Provider).Equals(app.FacebookProvider)
return app.ErrNotFound
})
bus.AddHandler(func(ctx context.Context, q *query.GetOAuthProfile) error {
- if q.Provider == app.FacebookProvider && q.Code == "456" {
- q.Result = &dto.OAuthUserProfile{
- ID: "FB456",
- Name: "Some Facebook Guy",
- Email: "[email protected]",
- }
- return nil
+ Expect(q.Provider).Equals(app.FacebookProvider)
+ Expect(q.Code).Equals("456")
+
+ q.Result = &dto.OAuthUserProfile{
+ ID: "FB456",
+ Name: "Some Facebook Guy",
+ Email: "[email protected]",
}
- return app.ErrNotFound
+ return nil
})
server := mock.NewServer()
@@ -278,6 +287,10 @@ func TestOAuthTokenHandler_NewUserWithoutEmail(t *testing.T) {
return app.ErrNotFound
})
+ bus.AddHandler(func(ctx context.Context, q *query.GetCustomOAuthConfigByProvider) error {
+ return app.ErrNotFound
+ })
+
bus.AddHandler(func(ctx context.Context, q *query.GetOAuthProfile) error {
if q.Provider == app.FacebookProvider && q.Code == "798" {
q.Result = &dto.OAuthUserProfile{
@@ -414,7 +427,7 @@ func TestOAuthTokenHandler_ExistingUser_NewProvider(t *testing.T) {
ExpectFiderAuthCookie(response, mock.JonSnow)
}
-func TestOAuthTokenHandler_NewUser_PrivateTenant(t *testing.T) {
+func TestOAuthTokenHandler_NewUser_PrivateSite(t *testing.T) {
RegisterT(t)
server := mock.NewServer()
@@ -428,16 +441,20 @@ func TestOAuthTokenHandler_NewUser_PrivateTenant(t *testing.T) {
return app.ErrNotFound
})
+ bus.AddHandler(func(ctx context.Context, q *query.GetCustomOAuthConfigByProvider) error {
+ Expect(q.Provider).Equals(app.FacebookProvider)
+ return app.ErrNotFound
+ })
+
bus.AddHandler(func(ctx context.Context, q *query.GetOAuthProfile) error {
- if q.Provider == app.FacebookProvider && q.Code == "456" {
- q.Result = &dto.OAuthUserProfile{
- ID: "FB456",
- Name: "Some Facebook Guy",
- Email: "[email protected]",
- }
- return nil
+ Expect(q.Provider).Equals(app.FacebookProvider)
+ Expect(q.Code).Equals("456")
+ q.Result = &dto.OAuthUserProfile{
+ ID: "FB456",
+ Name: "Some Facebook Guy",
+ Email: "[email protected]",
}
- return app.ErrNotFound
+ return nil
})
code, response := server.
@@ -453,6 +470,73 @@ func TestOAuthTokenHandler_NewUser_PrivateTenant(t *testing.T) {
ExpectFiderAuthCookie(response, nil)
}
+func TestOAuthTokenHandler_NewUser_PrivateSite_UsingTrustedProvider(t *testing.T) {
+ RegisterT(t)
+
+ server := mock.NewServer()
+ mock.AvengersTenant.IsPrivate = true
+
+ providerCode := "_jd72hfjv"
+
+ bus.AddHandler(func(ctx context.Context, c *cmd.RegisterUser) error {
+ Expect(c.User.Name).Equals("Mark Doe")
+ Expect(c.User.Email).Equals("[email protected]")
+ Expect(c.User.Providers).HasLen(1)
+ Expect(c.User.Providers[0].UID).Equals("1234-5678")
+ Expect(c.User.Providers[0].Name).Equals(providerCode)
+ Expect(c.User.Role).Equals(enum.RoleVisitor)
+
+ c.User.ID = 999
+ return nil
+ })
+
+ bus.AddHandler(func(ctx context.Context, q *query.GetUserByEmail) error {
+ return app.ErrNotFound
+ })
+
+ bus.AddHandler(func(ctx context.Context, q *query.GetUserByProvider) error {
+ return app.ErrNotFound
+ })
+
+ bus.AddHandler(func(ctx context.Context, q *query.GetCustomOAuthConfigByProvider) error {
+ Expect(q.Provider).Equals(providerCode)
+ q.Result = &entity.OAuthConfig{
+ Provider: providerCode,
+ DisplayName: "Microsoft AD",
+ IsTrusted: true,
+ }
+ return nil
+ })
+
+ bus.AddHandler(func(ctx context.Context, q *query.GetOAuthProfile) error {
+ Expect(q.Provider).Equals(providerCode)
+ Expect(q.Code).Equals("000111")
+ q.Result = &dto.OAuthUserProfile{
+ ID: "1234-5678",
+ Name: "Mark Doe",
+ Email: "[email protected]",
+ }
+ return nil
+ })
+
+ code, response := server.
+ WithURL("http://feedback.theavengers.com/oauth/"+providerCode+"/token?code=000111&identifier=MY_SESSION_ID&redirect=/").
+ OnTenant(mock.AvengersTenant).
+ AddParam("provider", providerCode).
+ AddCookie(web.CookieSessionName, "MY_SESSION_ID").
+ Use(middlewares.Session()).
+ Execute(handlers.OAuthToken())
+
+ Expect(code).Equals(http.StatusTemporaryRedirect)
+
+ Expect(response.Header().Get("Location")).Equals("/")
+ ExpectFiderAuthCookie(response, &entity.User{
+ ID: 999,
+ Name: "Mark Doe",
+ Email: "[email protected]",
+ })
+}
+
func TestOAuthTokenHandler_InvalidIdentifier(t *testing.T) {
RegisterT(t)
server := mock.NewServer()
diff --git a/app/models/cmd/oauth.go b/app/models/cmd/oauth.go
index f80fa1e19..d8e8c27f1 100644
--- a/app/models/cmd/oauth.go
+++ b/app/models/cmd/oauth.go
@@ -16,6 +16,7 @@ type SaveCustomOAuthConfig struct {
TokenURL string
Scope string
ProfileURL string
+ IsTrusted bool
JSONUserIDPath string
JSONUserNamePath string
JSONUserEmailPath string
diff --git a/app/models/entity/oauth.go b/app/models/entity/oauth.go
index c731502d5..250183de4 100644
--- a/app/models/entity/oauth.go
+++ b/app/models/entity/oauth.go
@@ -15,6 +15,7 @@ type OAuthConfig struct {
TokenURL string
ProfileURL string
Scope string
+ IsTrusted bool
JSONUserIDPath string
JSONUserNamePath string
JSONUserEmailPath string
@@ -38,6 +39,7 @@ func (o OAuthConfig) MarshalJSON() ([]byte, error) {
"tokenURL": o.TokenURL,
"profileURL": o.ProfileURL,
"scope": o.Scope,
+ "isTrusted": o.IsTrusted,
"jsonUserIDPath": o.JSONUserIDPath,
"jsonUserNamePath": o.JSONUserNamePath,
"jsonUserEmailPath": o.JSONUserEmailPath,
diff --git a/app/services/oauth/oauth.go b/app/services/oauth/oauth.go
index d4a4f639a..d94ee3eb3 100644
--- a/app/services/oauth/oauth.go
+++ b/app/services/oauth/oauth.go
@@ -65,6 +65,7 @@ var (
DisplayName: "Facebook",
ProfileURL: "https://graph.facebook.com/me?fields=name,email",
Status: getProviderStatus(env.Config.OAuth.Facebook.AppID),
+ IsTrusted: false,
ClientID: env.Config.OAuth.Facebook.AppID,
ClientSecret: env.Config.OAuth.Facebook.Secret,
Scope: "public_profile email",
@@ -79,6 +80,7 @@ var (
DisplayName: "Google",
ProfileURL: "https://www.googleapis.com/oauth2/v2/userinfo",
Status: getProviderStatus(env.Config.OAuth.Google.ClientID),
+ IsTrusted: false,
ClientID: env.Config.OAuth.Google.ClientID,
ClientSecret: env.Config.OAuth.Google.Secret,
Scope: "profile email",
@@ -93,6 +95,7 @@ var (
DisplayName: "GitHub",
ProfileURL: "https://api.github.com/user",
Status: getProviderStatus(env.Config.OAuth.GitHub.ClientID),
+ IsTrusted: false,
ClientID: env.Config.OAuth.GitHub.ClientID,
ClientSecret: env.Config.OAuth.GitHub.Secret,
Scope: "user:email",
diff --git a/app/services/sqlstore/postgres/oauth.go b/app/services/sqlstore/postgres/oauth.go
index d9c66b134..55b9b91d7 100644
--- a/app/services/sqlstore/postgres/oauth.go
+++ b/app/services/sqlstore/postgres/oauth.go
@@ -18,6 +18,7 @@ type dbOAuthConfig struct {
DisplayName string `db:"display_name"`
LogoBlobKey string `db:"logo_bkey"`
Status int `db:"status"`
+ IsTrusted bool `db:"is_trusted"`
ClientID string `db:"client_id"`
ClientSecret string `db:"client_secret"`
AuthorizeURL string `db:"authorize_url"`
@@ -35,6 +36,7 @@ func (m *dbOAuthConfig) toModel() *entity.OAuthConfig {
Provider: m.Provider,
DisplayName: m.DisplayName,
Status: m.Status,
+ IsTrusted: m.IsTrusted,
LogoBlobKey: m.LogoBlobKey,
ClientID: m.ClientID,
ClientSecret: m.ClientSecret,
@@ -56,7 +58,7 @@ func getCustomOAuthConfigByProvider(ctx context.Context, q *query.GetCustomOAuth
config := &dbOAuthConfig{}
err := trx.Get(config, `
- SELECT id, provider, display_name, status, logo_bkey,
+ SELECT id, provider, display_name, status, is_trusted, logo_bkey,
client_id, client_secret, authorize_url,
profile_url, token_url, scope, json_user_id_path,
json_user_name_path, json_user_email_path
@@ -81,7 +83,7 @@ func listCustomOAuthConfig(ctx context.Context, q *query.ListCustomOAuthConfig)
configs := []*dbOAuthConfig{}
if tenant != nil {
err := trx.Select(&configs, `
- SELECT id, provider, display_name, status, logo_bkey,
+ SELECT id, provider, display_name, status, is_trusted, logo_bkey,
client_id, client_secret, authorize_url,
profile_url, token_url, scope, json_user_id_path,
json_user_name_path, json_user_email_path
@@ -111,15 +113,15 @@ func saveCustomOAuthConfig(ctx context.Context, c *cmd.SaveCustomOAuthConfig) er
if c.ID == 0 {
query := `INSERT INTO oauth_providers (
- tenant_id, provider, display_name, status,
+ tenant_id, provider, display_name, status, is_trusted,
client_id, client_secret, authorize_url,
profile_url, token_url, scope, json_user_id_path,
json_user_name_path, json_user_email_path, logo_bkey
- ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14)
+ ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15)
RETURNING id`
err = trx.Get(&c.ID, query, tenant.ID, c.Provider,
- c.DisplayName, c.Status, c.ClientID, c.ClientSecret,
+ c.DisplayName, c.Status, c.IsTrusted, c.ClientID, c.ClientSecret,
c.AuthorizeURL, c.ProfileURL, c.TokenURL,
c.Scope, c.JSONUserIDPath, c.JSONUserNamePath,
c.JSONUserEmailPath, c.Logo.BlobKey)
@@ -129,14 +131,14 @@ func saveCustomOAuthConfig(ctx context.Context, c *cmd.SaveCustomOAuthConfig) er
SET display_name = $3, status = $4, client_id = $5, client_secret = $6,
authorize_url = $7, profile_url = $8, token_url = $9, scope = $10,
json_user_id_path = $11, json_user_name_path = $12, json_user_email_path = $13,
- logo_bkey = $14
+ logo_bkey = $14, is_trusted = $15
WHERE tenant_id = $1 AND id = $2`
_, err = trx.Execute(query, tenant.ID, c.ID,
c.DisplayName, c.Status, c.ClientID, c.ClientSecret,
c.AuthorizeURL, c.ProfileURL, c.TokenURL,
c.Scope, c.JSONUserIDPath, c.JSONUserNamePath,
- c.JSONUserEmailPath, c.Logo.BlobKey)
+ c.JSONUserEmailPath, c.Logo.BlobKey, c.IsTrusted)
}
if err != nil {
diff --git a/migrations/202205082055_trusted_provider.sql b/migrations/202205082055_trusted_provider.sql
new file mode 100644
index 000000000..87b184358
--- /dev/null
+++ b/migrations/202205082055_trusted_provider.sql
@@ -0,0 +1,3 @@
+ALTER TABLE oauth_providers ADD is_trusted BOOLEAN default false;
+
+CREATE UNIQUE INDEX oauth_provider_uq ON oauth_providers (provider);
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index d2d5f6d3f..ee73e7c03 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6414,54 +6414,6 @@
"esbuild-windows-arm64": "0.14.38"
}
},
- "node_modules/esbuild-android-64": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.38.tgz",
- "integrity": "sha512-aRFxR3scRKkbmNuGAK+Gee3+yFxkTJO/cx83Dkyzo4CnQl/2zVSurtG6+G86EQIZ+w+VYngVyK7P3HyTBKu3nw==",
- "cpu": [
- "x64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "android"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/esbuild-android-arm64": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.38.tgz",
- "integrity": "sha512-L2NgQRWuHFI89IIZIlpAcINy9FvBk6xFVZ7xGdOwIm8VyhX1vNCEqUJO3DPSSy945Gzdg98cxtNt8Grv1CsyhA==",
- "cpu": [
- "arm64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "android"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/esbuild-darwin-64": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.38.tgz",
- "integrity": "sha512-5JJvgXkX87Pd1Og0u/NJuO7TSqAikAcQQ74gyJ87bqWRVeouky84ICoV4sN6VV53aTW+NE87qLdGY4QA2S7KNA==",
- "cpu": [
- "x64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "darwin"
- ],
- "engines": {
- "node": ">=12"
- }
- },
"node_modules/esbuild-darwin-arm64": {
"version": "0.14.38",
"resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.38.tgz",
@@ -6478,198 +6430,6 @@
"node": ">=12"
}
},
- "node_modules/esbuild-freebsd-64": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.38.tgz",
- "integrity": "sha512-epnPbhZUt93xV5cgeY36ZxPXDsQeO55DppzsIgWM8vgiG/Rz+qYDLmh5ts3e+Ln1wA9dQ+nZmVHw+RjaW3I5Ig==",
- "cpu": [
- "x64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "freebsd"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/esbuild-freebsd-arm64": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.38.tgz",
- "integrity": "sha512-/9icXUYJWherhk+y5fjPI5yNUdFPtXHQlwP7/K/zg8t8lQdHVj20SqU9/udQmeUo5pDFHMYzcEFfJqgOVeKNNQ==",
- "cpu": [
- "arm64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "freebsd"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/esbuild-linux-32": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.38.tgz",
- "integrity": "sha512-QfgfeNHRFvr2XeHFzP8kOZVnal3QvST3A0cgq32ZrHjSMFTdgXhMhmWdKzRXP/PKcfv3e2OW9tT9PpcjNvaq6g==",
- "cpu": [
- "ia32"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/esbuild-linux-64": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.38.tgz",
- "integrity": "sha512-uuZHNmqcs+Bj1qiW9k/HZU3FtIHmYiuxZ/6Aa+/KHb/pFKr7R3aVqvxlAudYI9Fw3St0VCPfv7QBpUITSmBR1Q==",
- "cpu": [
- "x64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/esbuild-linux-arm": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.38.tgz",
- "integrity": "sha512-FiFvQe8J3VKTDXG01JbvoVRXQ0x6UZwyrU4IaLBZeq39Bsbatd94Fuc3F1RGqPF5RbIWW7RvkVQjn79ejzysnA==",
- "cpu": [
- "arm"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/esbuild-linux-arm64": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.38.tgz",
- "integrity": "sha512-HlMGZTEsBrXrivr64eZ/EO0NQM8H8DuSENRok9d+Jtvq8hOLzrxfsAT9U94K3KOGk2XgCmkaI2KD8hX7F97lvA==",
- "cpu": [
- "arm64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/esbuild-linux-mips64le": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.38.tgz",
- "integrity": "sha512-qd1dLf2v7QBiI5wwfil9j0HG/5YMFBAmMVmdeokbNAMbcg49p25t6IlJFXAeLzogv1AvgaXRXvgFNhScYEUXGQ==",
- "cpu": [
- "mips64el"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/esbuild-linux-ppc64le": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.38.tgz",
- "integrity": "sha512-mnbEm7o69gTl60jSuK+nn+pRsRHGtDPfzhrqEUXyCl7CTOCLtWN2bhK8bgsdp6J/2NyS/wHBjs1x8aBWwP2X9Q==",
- "cpu": [
- "ppc64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/esbuild-linux-riscv64": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.38.tgz",
- "integrity": "sha512-+p6YKYbuV72uikChRk14FSyNJZ4WfYkffj6Af0/Tw63/6TJX6TnIKE+6D3xtEc7DeDth1fjUOEqm+ApKFXbbVQ==",
- "cpu": [
- "riscv64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/esbuild-linux-s390x": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.38.tgz",
- "integrity": "sha512-0zUsiDkGJiMHxBQ7JDU8jbaanUY975CdOW1YDrurjrM0vWHfjv9tLQsW9GSyEb/heSK1L5gaweRjzfUVBFoybQ==",
- "cpu": [
- "s390x"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/esbuild-netbsd-64": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.38.tgz",
- "integrity": "sha512-cljBAApVwkpnJZfnRVThpRBGzCi+a+V9Ofb1fVkKhtrPLDYlHLrSYGtmnoTVWDQdU516qYI8+wOgcGZ4XIZh0Q==",
- "cpu": [
- "x64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "netbsd"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/esbuild-openbsd-64": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.38.tgz",
- "integrity": "sha512-CDswYr2PWPGEPpLDUO50mL3WO/07EMjnZDNKpmaxUPsrW+kVM3LoAqr/CE8UbzugpEiflYqJsGPLirThRB18IQ==",
- "cpu": [
- "x64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "openbsd"
- ],
- "engines": {
- "node": ">=12"
- }
- },
"node_modules/esbuild-plugin-babel": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/esbuild-plugin-babel/-/esbuild-plugin-babel-0.2.3.tgz",
@@ -6679,70 +6439,6 @@
"@babel/core": "^7.0.0"
}
},
- "node_modules/esbuild-sunos-64": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.38.tgz",
- "integrity": "sha512-2mfIoYW58gKcC3bck0j7lD3RZkqYA7MmujFYmSn9l6TiIcAMpuEvqksO+ntBgbLep/eyjpgdplF7b+4T9VJGOA==",
- "cpu": [
- "x64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "sunos"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/esbuild-windows-32": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.38.tgz",
- "integrity": "sha512-L2BmEeFZATAvU+FJzJiRLFUP+d9RHN+QXpgaOrs2klshoAm1AE6Us4X6fS9k33Uy5SzScn2TpcgecbqJza1Hjw==",
- "cpu": [
- "ia32"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "win32"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/esbuild-windows-64": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.38.tgz",
- "integrity": "sha512-Khy4wVmebnzue8aeSXLC+6clo/hRYeNIm0DyikoEqX+3w3rcvrhzpoix0S+MF9vzh6JFskkIGD7Zx47ODJNyCw==",
- "cpu": [
- "x64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "win32"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/esbuild-windows-arm64": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.38.tgz",
- "integrity": "sha512-k3FGCNmHBkqdJXuJszdWciAH77PukEyDsdIryEHn9cKLQFxzhT39dSumeTuggaQcXY57UlmLGIkklWZo2qzHpw==",
- "cpu": [
- "arm64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "win32"
- ],
- "engines": {
- "node": ">=12"
- }
- },
"node_modules/escalade": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
@@ -21421,27 +21117,6 @@
"esbuild-windows-arm64": "0.14.38"
}
},
- "esbuild-android-64": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.38.tgz",
- "integrity": "sha512-aRFxR3scRKkbmNuGAK+Gee3+yFxkTJO/cx83Dkyzo4CnQl/2zVSurtG6+G86EQIZ+w+VYngVyK7P3HyTBKu3nw==",
- "dev": true,
- "optional": true
- },
- "esbuild-android-arm64": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.38.tgz",
- "integrity": "sha512-L2NgQRWuHFI89IIZIlpAcINy9FvBk6xFVZ7xGdOwIm8VyhX1vNCEqUJO3DPSSy945Gzdg98cxtNt8Grv1CsyhA==",
- "dev": true,
- "optional": true
- },
- "esbuild-darwin-64": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.38.tgz",
- "integrity": "sha512-5JJvgXkX87Pd1Og0u/NJuO7TSqAikAcQQ74gyJ87bqWRVeouky84ICoV4sN6VV53aTW+NE87qLdGY4QA2S7KNA==",
- "dev": true,
- "optional": true
- },
"esbuild-darwin-arm64": {
"version": "0.14.38",
"resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.38.tgz",
@@ -21449,90 +21124,6 @@
"dev": true,
"optional": true
},
- "esbuild-freebsd-64": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.38.tgz",
- "integrity": "sha512-epnPbhZUt93xV5cgeY36ZxPXDsQeO55DppzsIgWM8vgiG/Rz+qYDLmh5ts3e+Ln1wA9dQ+nZmVHw+RjaW3I5Ig==",
- "dev": true,
- "optional": true
- },
- "esbuild-freebsd-arm64": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.38.tgz",
- "integrity": "sha512-/9icXUYJWherhk+y5fjPI5yNUdFPtXHQlwP7/K/zg8t8lQdHVj20SqU9/udQmeUo5pDFHMYzcEFfJqgOVeKNNQ==",
- "dev": true,
- "optional": true
- },
- "esbuild-linux-32": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.38.tgz",
- "integrity": "sha512-QfgfeNHRFvr2XeHFzP8kOZVnal3QvST3A0cgq32ZrHjSMFTdgXhMhmWdKzRXP/PKcfv3e2OW9tT9PpcjNvaq6g==",
- "dev": true,
- "optional": true
- },
- "esbuild-linux-64": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.38.tgz",
- "integrity": "sha512-uuZHNmqcs+Bj1qiW9k/HZU3FtIHmYiuxZ/6Aa+/KHb/pFKr7R3aVqvxlAudYI9Fw3St0VCPfv7QBpUITSmBR1Q==",
- "dev": true,
- "optional": true
- },
- "esbuild-linux-arm": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.38.tgz",
- "integrity": "sha512-FiFvQe8J3VKTDXG01JbvoVRXQ0x6UZwyrU4IaLBZeq39Bsbatd94Fuc3F1RGqPF5RbIWW7RvkVQjn79ejzysnA==",
- "dev": true,
- "optional": true
- },
- "esbuild-linux-arm64": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.38.tgz",
- "integrity": "sha512-HlMGZTEsBrXrivr64eZ/EO0NQM8H8DuSENRok9d+Jtvq8hOLzrxfsAT9U94K3KOGk2XgCmkaI2KD8hX7F97lvA==",
- "dev": true,
- "optional": true
- },
- "esbuild-linux-mips64le": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.38.tgz",
- "integrity": "sha512-qd1dLf2v7QBiI5wwfil9j0HG/5YMFBAmMVmdeokbNAMbcg49p25t6IlJFXAeLzogv1AvgaXRXvgFNhScYEUXGQ==",
- "dev": true,
- "optional": true
- },
- "esbuild-linux-ppc64le": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.38.tgz",
- "integrity": "sha512-mnbEm7o69gTl60jSuK+nn+pRsRHGtDPfzhrqEUXyCl7CTOCLtWN2bhK8bgsdp6J/2NyS/wHBjs1x8aBWwP2X9Q==",
- "dev": true,
- "optional": true
- },
- "esbuild-linux-riscv64": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.38.tgz",
- "integrity": "sha512-+p6YKYbuV72uikChRk14FSyNJZ4WfYkffj6Af0/Tw63/6TJX6TnIKE+6D3xtEc7DeDth1fjUOEqm+ApKFXbbVQ==",
- "dev": true,
- "optional": true
- },
- "esbuild-linux-s390x": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.38.tgz",
- "integrity": "sha512-0zUsiDkGJiMHxBQ7JDU8jbaanUY975CdOW1YDrurjrM0vWHfjv9tLQsW9GSyEb/heSK1L5gaweRjzfUVBFoybQ==",
- "dev": true,
- "optional": true
- },
- "esbuild-netbsd-64": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.38.tgz",
- "integrity": "sha512-cljBAApVwkpnJZfnRVThpRBGzCi+a+V9Ofb1fVkKhtrPLDYlHLrSYGtmnoTVWDQdU516qYI8+wOgcGZ4XIZh0Q==",
- "dev": true,
- "optional": true
- },
- "esbuild-openbsd-64": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.38.tgz",
- "integrity": "sha512-CDswYr2PWPGEPpLDUO50mL3WO/07EMjnZDNKpmaxUPsrW+kVM3LoAqr/CE8UbzugpEiflYqJsGPLirThRB18IQ==",
- "dev": true,
- "optional": true
- },
"esbuild-plugin-babel": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/esbuild-plugin-babel/-/esbuild-plugin-babel-0.2.3.tgz",
@@ -21540,34 +21131,6 @@
"dev": true,
"requires": {}
},
- "esbuild-sunos-64": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.38.tgz",
- "integrity": "sha512-2mfIoYW58gKcC3bck0j7lD3RZkqYA7MmujFYmSn9l6TiIcAMpuEvqksO+ntBgbLep/eyjpgdplF7b+4T9VJGOA==",
- "dev": true,
- "optional": true
- },
- "esbuild-windows-32": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.38.tgz",
- "integrity": "sha512-L2BmEeFZATAvU+FJzJiRLFUP+d9RHN+QXpgaOrs2klshoAm1AE6Us4X6fS9k33Uy5SzScn2TpcgecbqJza1Hjw==",
- "dev": true,
- "optional": true
- },
- "esbuild-windows-64": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.38.tgz",
- "integrity": "sha512-Khy4wVmebnzue8aeSXLC+6clo/hRYeNIm0DyikoEqX+3w3rcvrhzpoix0S+MF9vzh6JFskkIGD7Zx47ODJNyCw==",
- "dev": true,
- "optional": true
- },
- "esbuild-windows-arm64": {
- "version": "0.14.38",
- "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.38.tgz",
- "integrity": "sha512-k3FGCNmHBkqdJXuJszdWciAH77PukEyDsdIryEHn9cKLQFxzhT39dSumeTuggaQcXY57UlmLGIkklWZo2qzHpw==",
- "dev": true,
- "optional": true
- },
"escalade": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
diff --git a/public/components/common/form/Form.scss b/public/components/common/form/Form.scss
index 760c2d4ad..6d46824f4 100644
--- a/public/components/common/form/Form.scss
+++ b/public/components/common/form/Form.scss
@@ -1,7 +1,7 @@
@import "~@fider/assets/styles/variables.scss";
.c-form-field {
- margin-bottom: spacing(2);
+ margin-bottom: spacing(5);
> label {
display: block;
diff --git a/public/models/settings.ts b/public/models/settings.ts
index 6bfcc2a9c..1c9314f90 100644
--- a/public/models/settings.ts
+++ b/public/models/settings.ts
@@ -45,6 +45,7 @@ export interface OAuthConfig {
jsonUserIDPath: string
jsonUserNamePath: string
jsonUserEmailPath: string
+ isTrusted: boolean
}
export interface ImageUpload {
diff --git a/public/pages/Administration/components/OAuthForm.tsx b/public/pages/Administration/components/OAuthForm.tsx
index 1c606030b..793470b97 100644
--- a/public/pages/Administration/components/OAuthForm.tsx
+++ b/public/pages/Administration/components/OAuthForm.tsx
@@ -16,6 +16,7 @@ export const OAuthForm: React.FC<OAuthFormProps> = (props) => {
const [provider] = useState((props.config && props.config.provider) || "")
const [displayName, setDisplayName] = useState((props.config && props.config.displayName) || "")
const [enabled, setEnabled] = useState((props.config && props.config.status === OAuthConfigStatus.Enabled) || false)
+ const [isTrusted, setTrusted] = useState((props.config && props.config.isTrusted) || false)
const [clientID, setClientID] = useState((props.config && props.config.clientID) || "")
const [clientSecret, setClientSecret] = useState((props.config && props.config.clientSecret) || "")
const [clientSecretEnabled, setClientSecretEnabled] = useState(!props.config)
@@ -35,6 +36,7 @@ export const OAuthForm: React.FC<OAuthFormProps> = (props) => {
const result = await actions.saveOAuthConfig({
provider,
status: enabled ? OAuthConfigStatus.Enabled : OAuthConfigStatus.Disabled,
+ isTrusted,
displayName,
clientID,
clientSecret: clientSecretEnabled ? clientSecret : "",
@@ -207,6 +209,17 @@ export const OAuthForm: React.FC<OAuthFormProps> = (props) => {
`}
</pre>
+ <Field label="Trusted Source">
+ <Toggle field="isTrusted" active={isTrusted} onToggle={setTrusted} label={isTrusted ? "Yes" : "No"} />
+ <p className="text-muted mt-1">
+ This setting only applies to private sites. This site is currently <strong>{fider.session.tenant.isPrivate ? "Private" : "Public"}</strong>.
+ </p>
+ <p className="text-muted">
+ If enabled, users authenticated by this provider can get access to this site without being invited. This is recommended for corporate access, such
+ as Okta, Microsoft AD, Google Workspace and others. Do not use this for public identity providers such as Facebook or Twitter.
+ </p>
+ </Field>
+
<Field label="Status">
<Toggle field="status" disabled={props.cantDisable} active={enabled} onToggle={setEnabled} label={enabled ? "Enabled" : "Disabled"} />
<div className="mt-1">
diff --git a/public/pages/Administration/pages/ManageAuthentication.page.tsx b/public/pages/Administration/pages/ManageAuthentication.page.tsx
index 97e8cf85f..7094021d7 100644
--- a/public/pages/Administration/pages/ManageAuthentication.page.tsx
+++ b/public/pages/Administration/pages/ManageAuthentication.page.tsx
@@ -68,7 +68,7 @@ export default class ManageAuthenticationPage extends AdminBasePage<ManageAuthen
async () => {
const response = await actions.updateTenantEmailAuthAllowed(this.state.isEmailAuthAllowed)
if (response.ok) {
- notify.success(`You successfully ${this.state.isEmailAuthAllowed ? "allowed" : "disallowed"} email authentication.`)
+ notify.success(`You successfully changed email authentication setting.`)
} else {
this.setState(
() => ({
@@ -106,11 +106,11 @@ export default class ManageAuthenticationPage extends AdminBasePage<ManageAuthen
<VStack spacing={8}>
<div>
<h2 className="text-display">General Authentication</h2>
- <Form error={this.state.error}>
- <Field label="Allow Email Authentication">
+ <Form error={this.state.error} className="mt-4">
+ <Field label="Allow Email Authentication" className="mt-2">
<Toggle
field="isEmailAuthAllowed"
- label={this.state.isEmailAuthAllowed ? "Allowed" : "Disallowed"}
+ label={this.state.isEmailAuthAllowed ? "Yes" : "No"}
disabled={!Fider.session.user.isAdministrator || !this.state.canDisableEmailAuth}
active={this.state.isEmailAuthAllowed}
onToggle={this.toggleEmailAuth}
@@ -120,8 +120,7 @@ export default class ManageAuthenticationPage extends AdminBasePage<ManageAuthen
)}
<p className="text-muted my-1">
When email-based authentication is disabled, users will not be allowed to sign in using their email. Thus, they will be forced to use another
- authentication provider, such as your preferred OAuth provider.{" "}
- <strong>Be sure to enable and test one before you turn this setting off!</strong>
+ authentication provider, such as your preferred OAuth provider.
</p>
<p className="text-muted mt-1">Note: Administrator accounts will still be allowed to sign in using their email.</p>
</Field>
diff --git a/public/pages/Administration/pages/PrivacySettings.page.tsx b/public/pages/Administration/pages/PrivacySettings.page.tsx
index 5236c30b5..be9968c12 100644
--- a/public/pages/Administration/pages/PrivacySettings.page.tsx
+++ b/public/pages/Administration/pages/PrivacySettings.page.tsx
@@ -41,8 +41,8 @@ export default class PrivacySettingsPage extends AdminBasePage<any, PrivacySetti
<Field label="Private Site">
<Toggle disabled={!Fider.session.user.isAdministrator} active={this.state.isPrivate} onToggle={this.toggle} />
<p className="text-muted mt-1">
- A private site prevents unauthenticated users from viewing or interacting with its content. <br /> If enabled, only already registered and invited
- users will be able to sign in to this site.
+ A private site prevents unauthenticated users from viewing or interacting with its content. <br /> If enabled, only already registered, as well as
+ invited users will have access to this site.
</p>
</Field>
</Form>
diff --git a/public/services/actions/tenant.ts b/public/services/actions/tenant.ts
index 22f4217a5..43cb2703d 100644
--- a/public/services/actions/tenant.ts
+++ b/public/services/actions/tenant.ts
@@ -101,6 +101,7 @@ export interface CreateEditOAuthConfigRequest {
jsonUserNamePath: string
jsonUserEmailPath: string
logo?: ImageUpload
+ isTrusted: boolean
}
export const saveOAuthConfig = async (request: CreateEditOAuthConfigRequest): Promise<Result> => {