新增 OIDC/SSO、邮件验证码与 Gitea 项目同步,并强化 Feed 与管理后台。
作为 OIDC Provider 对接 Gitea;注册支持邮件验证码/验证码;侧栏同步公开仓库;Feed 分页、文章大纲、标签云与站点品牌设置。 Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -18,9 +18,16 @@ const (
|
||||
|
||||
// fileSettings 从 app.ini 读出的原始值(尚未解析为绝对路径)
|
||||
type fileSettings struct {
|
||||
Port int
|
||||
DataRel string
|
||||
JWTSecret string
|
||||
Port int
|
||||
DataRel string
|
||||
JWTSecret string
|
||||
RootURL string
|
||||
OAuthClientID string
|
||||
OAuthClientSecret string
|
||||
OAuthRedirectURIs string
|
||||
GiteaBaseURL string
|
||||
GiteaToken string
|
||||
GiteaSyncEnabled bool
|
||||
}
|
||||
|
||||
func defaultFileSettings() fileSettings {
|
||||
@@ -50,6 +57,7 @@ func loadAppINI(path string) (fileSettings, error) {
|
||||
}
|
||||
out.Port = p
|
||||
}
|
||||
out.RootURL = strings.TrimSpace(sec.Key("ROOT_URL").String())
|
||||
}
|
||||
|
||||
if sec, err := cfg.GetSection("paths"); err == nil {
|
||||
@@ -62,11 +70,23 @@ func loadAppINI(path string) (fileSettings, error) {
|
||||
out.JWTSecret = strings.TrimSpace(sec.Key("JWT_SECRET").String())
|
||||
}
|
||||
|
||||
if sec, err := cfg.GetSection("oauth"); err == nil {
|
||||
out.OAuthClientID = strings.TrimSpace(sec.Key("CLIENT_ID").String())
|
||||
out.OAuthClientSecret = strings.TrimSpace(sec.Key("CLIENT_SECRET").String())
|
||||
out.OAuthRedirectURIs = strings.TrimSpace(sec.Key("REDIRECT_URIS").String())
|
||||
}
|
||||
|
||||
if sec, err := cfg.GetSection("gitea"); err == nil {
|
||||
out.GiteaBaseURL = strings.TrimSpace(sec.Key("BASE_URL").String())
|
||||
out.GiteaToken = strings.TrimSpace(sec.Key("TOKEN").String())
|
||||
out.GiteaSyncEnabled = sec.Key("SYNC_ENABLED").MustBool(false)
|
||||
}
|
||||
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// writeAppINI 写入/覆盖 app.ini(安装服务或首次生成时使用)
|
||||
func writeAppINI(path string, port int, dataRel, jwtSecret string) error {
|
||||
func writeAppINI(path string, s fileSettings) error {
|
||||
if err := os.MkdirAll(filepath.Dir(path), 0755); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -80,17 +100,36 @@ func writeAppINI(path string, port int, dataRel, jwtSecret string) error {
|
||||
b.WriteString("\n")
|
||||
b.WriteString("[server]\n")
|
||||
b.WriteString("HTTP_PORT = ")
|
||||
b.WriteString(strconv.Itoa(port))
|
||||
b.WriteString(strconv.Itoa(s.Port))
|
||||
b.WriteString("\n")
|
||||
b.WriteString("; 对外公网根地址(无尾斜杠),OIDC Issuer / Discovery 依赖此项\n")
|
||||
b.WriteString("; 例:https://bbs.iioio.com\n")
|
||||
b.WriteString("ROOT_URL = ")
|
||||
b.WriteString(s.RootURL)
|
||||
b.WriteString("\n\n")
|
||||
b.WriteString("[paths]\n")
|
||||
b.WriteString("; 相对路径相对于工作目录(默认可执行文件所在目录)\n")
|
||||
b.WriteString("DATA = ")
|
||||
b.WriteString(dataRel)
|
||||
b.WriteString(s.DataRel)
|
||||
b.WriteString("\n\n")
|
||||
b.WriteString("[security]\n")
|
||||
b.WriteString("; 留空则自动生成并持久化到 data/.jwt_secret(勿把生产密钥提交到仓库)\n")
|
||||
b.WriteString("JWT_SECRET = ")
|
||||
b.WriteString(jwtSecret)
|
||||
b.WriteString(s.JWTSecret)
|
||||
b.WriteString("\n\n")
|
||||
b.WriteString("[oauth]\n")
|
||||
b.WriteString("; 作为 OIDC Provider 时,给 Gitea 等客户端使用的凭据(P0 写死在配置)\n")
|
||||
b.WriteString("; Gitea 认证源名称需与回调路径一致,例如名称 jiang13 对应:\n")
|
||||
b.WriteString("; https://git.iioio.com/user/oauth2/jiang13/callback\n")
|
||||
b.WriteString("CLIENT_ID = ")
|
||||
b.WriteString(s.OAuthClientID)
|
||||
b.WriteString("\n")
|
||||
b.WriteString("CLIENT_SECRET = ")
|
||||
b.WriteString(s.OAuthClientSecret)
|
||||
b.WriteString("\n")
|
||||
b.WriteString("; 多个回调用逗号分隔\n")
|
||||
b.WriteString("REDIRECT_URIS = ")
|
||||
b.WriteString(s.OAuthRedirectURIs)
|
||||
b.WriteString("\n")
|
||||
|
||||
return os.WriteFile(path, []byte(b.String()), 0644)
|
||||
|
||||
Reference in New Issue
Block a user