Hydrogen/Passport
Hydrogen/Passport
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

♻️ Separate application domain and token issuer

Browse Source
This commit is contained in:
LittleSheep 2024-08-12 20:58:20 +08:00
parent 142e7c3434
commit e4d73b1d31
5 changed files with 13 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
.idea/workspace.xml
View File

@ -4,65 +4,12 @@
<option name="autoReloadType" value="ALL" />
</component>
<component name="ChangeListManager">
<list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":bug: Fix permissions in groups">
<change beforePath="$PROJECT_DIR$/.idea/dataSources.local.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.local.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/dataSources/723637bc-6ce3-4bbe-afb3-d88730c75a1b.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/723637bc-6ce3-4bbe-afb3-d88730c75a1b.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/dataSources/74bcf3ef-a2b9-435b-b9e5-f32902a33b25.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/74bcf3ef-a2b9-435b-b9e5-f32902a33b25.xml" afterDir="false" />
<list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":wastebasket: Clean up code">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Dockerfile" beforeDir="false" afterPath="$PROJECT_DIR$/Dockerfile" afterDir="false" />
<change beforePath="$PROJECT_DIR$/go.mod" beforeDir="false" afterPath="$PROJECT_DIR$/go.mod" afterDir="false" />
<change beforePath="$PROJECT_DIR$/go.sum" beforeDir="false" afterPath="$PROJECT_DIR$/go.sum" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pkg/internal/server/api/well_known_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/server/api/well_known_api.go" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pkg/internal/services/jwt.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/services/jwt.go" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pkg/internal/services/ticket.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/services/ticket.go" afterDir="false" />
<change beforePath="$PROJECT_DIR$/settings.toml" beforeDir="false" afterPath="$PROJECT_DIR$/settings.toml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/web/.eslintrc.cjs" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/.gitignore" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/.prettierrc.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/.vite/deps/_metadata.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/.vite/deps/package.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/README.md" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/bun.lockb" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/env.d.ts" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/index.html" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/package.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/public/favicon.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/src/assets/utils.css" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/src/components/Copyright.vue" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/src/components/GoUseSolian.vue" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/src/components/NotificationList.vue" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/src/components/UserMenu.vue" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/src/components/admin/UserAssignPermsPanel.vue" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/src/components/admin/UserDetailPanel.vue" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/src/components/admin/UserFactorPanel.vue" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/src/components/auth/Authenticate.vue" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/src/components/auth/AuthenticateCompleted.vue" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/src/components/auth/CallbackNotify.vue" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/src/components/auth/FactorApplicator.vue" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/src/components/auth/FactorPicker.vue" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/src/components/navigation/AppBar.vue" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/src/index.vue" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/src/layouts/administrator.vue" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/src/layouts/master.vue" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/src/layouts/user-center.vue" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/src/main.ts" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/src/router/index.ts" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/src/scripts/request.ts" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/src/stores/notifications.ts" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/src/stores/userinfo.ts" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/src/views/admin/dashboard.vue" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/src/views/admin/users.vue" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/src/views/auth/authorize.vue" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/src/views/auth/claims.ts" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/src/views/auth/sign-in.vue" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/src/views/auth/sign-up.vue" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/src/views/dashboard.vue" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/src/views/flow/confirm.vue" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/src/views/flow/password-reset.vue" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/src/views/personalize.vue" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/src/views/security.vue" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/tsconfig.app.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/tsconfig.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/tsconfig.node.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/uno.config.ts" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/web/vite.config.ts" beforeDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -209,7 +156,6 @@
</option>
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value=":sparkles: Reset password APIs" />
<MESSAGE value=":sparkles: Password reset &amp; user lookup API" />
<MESSAGE value=":recycle: Optimized the initial permission system" />
<MESSAGE value=":zap: Optimized audit, event logging system&#10;:sparkles: Audit logs&#10;:sparkles: Admin edit user permissions" />
@ -234,7 +180,8 @@
<MESSAGE value=":sparkles: Account groups" />
<MESSAGE value=":sparkles: Default user group" />
<MESSAGE value=":bug: Fix permissions in groups" />
<option name="LAST_COMMIT_MESSAGE" value=":bug: Fix permissions in groups" />
<MESSAGE value=":wastebasket: Clean up code" />
<option name="LAST_COMMIT_MESSAGE" value=":wastebasket: Clean up code" />
</component>
<component name="VgoProject">
<settings-migrated>true</settings-migrated>

2
pkg/internal/server/api/well_known_api.go
View File

@ -12,7 +12,7 @@ func getOidcConfiguration(c *fiber.Ctx) error {
basepath := fmt.Sprintf("https://%s", domain)
return c.JSON(fiber.Map{
"issuer": basepath,
"issuer": viper.GetString("security.issuer"),
"authorization_endpoint": fmt.Sprintf("%s/authorize", basepath),
"token_endpoint": fmt.Sprintf("%s/api/auth/token", basepath),
"userinfo_endpoint": fmt.Sprintf("%s/api/users/me", basepath),

4
pkg/internal/services/jwt.go
View File

@ -20,7 +20,7 @@ type PayloadClaims struct {
Nick string `json:"preferred_username,omitempty"`
Email string `json:"email,omitempty"`
// Additonal Stuff
// Additional Stuff
AuthorizedParties string `json:"azp,omitempty"`
Nonce string `json:"nonce,omitempty"`
Type string `json:"typ"`
@ -44,7 +44,7 @@ func EncodeJwt(id string, typ, sub, sed string, nonce *string, aud []string, exp
RegisteredClaims: jwt.RegisteredClaims{
Subject: sub,
Audience: aud,
Issuer: fmt.Sprintf("https://%s", viper.GetString("domain")),
Issuer: viper.GetString("security.issuer"),
ExpiresAt: jwt.NewNumericDate(exp),
NotBefore: jwt.NewNumericDate(time.Now()),
IssuedAt: jwt.NewNumericDate(time.Now()),

2
pkg/internal/services/ticket.go
View File

@ -11,7 +11,7 @@ import (
"github.com/samber/lo"
)
const InternalTokenAudience = "passport"
const InternalTokenAudience = "solar-network"
func DetectRisk(user models.Account, ip, ua string) bool {
var clue int64

3
settings.toml
View File

@ -5,6 +5,8 @@ bind = "0.0.0.0:8444"
grpc_bind = "0.0.0.0:7444"
domain = "localhost"
domain = "id.solsynth.dev"
content_endpoint = "https://usercontent.solsynth.dev"
default_user_group = 1
@ -19,6 +21,7 @@ print_routes = false
addr = "127.0.0.1:7442"
[security]
issuer = "https://solsynth.dev"
cookie_domain = "localhost"
cookie_samesite = "Lax"
access_token_duration = 300