推进阿里云授权边界与验证加固
This commit is contained in:
1 parent
6e7720b53d
commit
e9c31312d4
13 files changed
+183
-397
No files matched your search
@@ -14,7 +14,6 @@ import (
|
||||
)
|
||||
|
||||
type aliyunScopeChecker interface {
|
||||
Discover(ctx context.Context, credentials map[string]string) (dnsprovider.AuthorizationReport, error)
|
||||
Verify(ctx context.Context, requestedDomain string, credentials map[string]string) (dnsprovider.AuthorizationReport, error)
|
||||
VerifyDomain(ctx context.Context, providerID, requestedDomain string, credentials map[string]string) error
|
||||
}
|
||||
@@ -23,95 +22,6 @@ type aliyunDomainCheckRequest struct {
|
||||
Domain string `json:"domain"`
|
||||
}
|
||||
|
||||
type aliyunScopeResponse struct {
|
||||
Provider string `json:"provider"`
|
||||
Configured bool `json:"configured"`
|
||||
CredentialRef string `json:"credential_ref,omitempty"`
|
||||
PolicyMode string `json:"policy_mode"`
|
||||
GlobalDiscoveryAvailable bool `json:"global_discovery_available"`
|
||||
Message string `json:"message"`
|
||||
DiscoveredDomains []dnsprovider.AuthorizationDomain `json:"discovered_domains,omitempty"`
|
||||
ManagedDomains []string `json:"managed_domains"`
|
||||
CheckedAt string `json:"checked_at"`
|
||||
UserScope *dnsprovider.AliyunScope `json:"user_scope,omitempty"`
|
||||
}
|
||||
|
||||
func (s *Server) getAliyunDNSScope(c *gin.Context) {
|
||||
s.configMu.RLock()
|
||||
provider := strings.ToLower(strings.TrimSpace(s.config.DNS.Provider))
|
||||
credentialRef := strings.TrimSpace(s.config.DNS.CredentialRef)
|
||||
s.configMu.RUnlock()
|
||||
|
||||
if provider != dnsprovider.Aliyun {
|
||||
c.JSON(http.StatusOK, aliyunScopeResponse{
|
||||
Provider: provider,
|
||||
Configured: false,
|
||||
PolicyMode: "not_aliyun",
|
||||
Message: "系统当前未将阿里云配置为主 DNS 服务商",
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
credentials, err := s.readDNSCredentials(c.Request.Context(), credentialRef)
|
||||
if err != nil {
|
||||
s.writeError(c, http.StatusInternalServerError, "读取阿里云 DNS 凭据失败", err)
|
||||
return
|
||||
}
|
||||
|
||||
response := aliyunScopeResponse{
|
||||
Provider: dnsprovider.Aliyun,
|
||||
Configured: true,
|
||||
CredentialRef: credentialRef,
|
||||
CheckedAt: s.now().UTC().Format("2006-01-02T15:04:05Z"),
|
||||
}
|
||||
scope, scopeErr := dnsprovider.ParseAliyunScope(credentials)
|
||||
if scopeErr != nil {
|
||||
response.PolicyMode = "scope_required"
|
||||
response.Message = scopeErr.Error()
|
||||
c.JSON(http.StatusOK, response)
|
||||
return
|
||||
}
|
||||
response.UserScope = &scope
|
||||
|
||||
// 读取当前系统内已经纳管的域名列表
|
||||
if s.repository != nil {
|
||||
if items, listErr := s.repository.List(c.Request.Context()); listErr == nil {
|
||||
for _, item := range items {
|
||||
response.ManagedDomains = append(response.ManagedDomains, item.Name)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if s.aliyunChecker == nil {
|
||||
response.PolicyMode = "uninitialized"
|
||||
response.Message = "阿里云权限探测器未装载"
|
||||
c.JSON(http.StatusOK, response)
|
||||
return
|
||||
}
|
||||
|
||||
// 默认采用资源受限安全模式,不盲目调用全局 DescribeDomains 接口,避免产生 RAM 未授权异常告警
|
||||
// 仅在显式请求参数 discover=true 时尝试全局探测
|
||||
if c.Query("discover") == "true" {
|
||||
report, discoverErr := s.aliyunChecker.Discover(c.Request.Context(), credentials)
|
||||
if discoverErr == nil && len(report.Domains) > 0 {
|
||||
response.GlobalDiscoveryAvailable = true
|
||||
response.PolicyMode = "broad_or_read_all"
|
||||
response.Message = "当前 RAM 账号具备全局根域名读取权限"
|
||||
response.DiscoveredDomains = report.Domains
|
||||
} else {
|
||||
response.GlobalDiscoveryAvailable = false
|
||||
response.PolicyMode = "resource_scoped"
|
||||
response.Message = "当前 RAM 账号受特定域名资源限制策略(最小权限原则),不支持全局枚举,已启用单域名靶向权威考证"
|
||||
}
|
||||
} else {
|
||||
response.GlobalDiscoveryAvailable = false
|
||||
response.PolicyMode = "resource_scoped"
|
||||
response.Message = "系统当前遵循 RAM 最小权限安全原则,采用单域名靶向精准考证"
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, response)
|
||||
}
|
||||
|
||||
func (s *Server) checkAliyunDNSDomain(c *gin.Context) {
|
||||
var request aliyunDomainCheckRequest
|
||||
if err := bindJSON(c, &request, jsonRequestBodyLimit); err != nil {
|
||||
@@ -145,7 +55,7 @@ func (s *Server) checkAliyunDNSDomain(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
if err := dnsprovider.ValidateAliyunDomainScope(provider, []string{targetDomain}, credentials); err != nil {
|
||||
if err := dnsprovider.ValidateAliyunTargetDomains(provider, []string{targetDomain}); err != nil {
|
||||
c.JSON(http.StatusOK, gin.H{"verified": false, "domain": targetDomain, "message": err.Error()})
|
||||
return
|
||||
}
|
||||
@@ -202,7 +112,7 @@ func (s *Server) validateDomainAliyunAuthorization(ctx context.Context, domainNa
|
||||
if _, err := dnsprovider.ValidateCredentials(dnsprovider.Aliyun, credentials); err != nil {
|
||||
return fmt.Errorf("阿里云 DNS 凭据无效,不能确认域名授权:%w", err)
|
||||
}
|
||||
if err := dnsprovider.ValidateAliyunDomainScope(provider, domainNames, credentials); err != nil {
|
||||
if err := dnsprovider.ValidateAliyunTargetDomains(provider, domainNames); err != nil {
|
||||
return err
|
||||
}
|
||||
for _, domainName := range domainNames {
|
||||
|
||||
@@ -11,7 +11,7 @@ const authStateCapacity = 4096
|
||||
const authUserSessionCapacity = 16
|
||||
|
||||
func (session authSession) complete() bool {
|
||||
return strings.TrimSpace(session.UserID) != "" && strings.TrimSpace(session.Username) != "" &&
|
||||
return strings.TrimSpace(session.UserID) != "" && strings.TrimSpace(session.Username) != "" && strings.TrimSpace(session.Email) != "" &&
|
||||
strings.TrimSpace(session.PasswordHash) != "" &&
|
||||
(session.Role == repository.UserRoleUser || session.Role == repository.UserRoleAdmin || session.Role == repository.UserRoleSuperAdmin)
|
||||
}
|
||||
|
||||
@@ -191,7 +191,6 @@ func (s *Server) registerRoutes() {
|
||||
adminAPI.PUT("/settings", s.updateSettings)
|
||||
adminAPI.GET("/dns/providers", s.listAdminDNSProviders)
|
||||
adminAPI.POST("/dns/test", s.dnsOperation, s.testAdminDNS)
|
||||
adminAPI.GET("/dns/aliyun/scope", s.getAliyunDNSScope)
|
||||
adminAPI.POST("/dns/aliyun/check", s.dnsOperation, s.checkAliyunDNSDomain)
|
||||
adminAPI.POST("/renewal/run", s.longOperation(certificateTaskTimeout), s.runRenewalNow)
|
||||
adminAPI.GET("/certificates", s.listCertificates)
|
||||
@@ -372,9 +371,9 @@ func (s *Server) ready(c *gin.Context) {
|
||||
s.writeReadinessFailure(c, "credential_unavailable")
|
||||
return
|
||||
}
|
||||
if reference == dnsReference && cfg.DNS.Provider == dnsprovider.Aliyun {
|
||||
if _, err := dnsprovider.ParseAliyunScope(credentials); err != nil {
|
||||
s.writeReadinessFailure(c, "dns_scope_required")
|
||||
if reference == dnsReference {
|
||||
if _, err := dnsprovider.ValidateCredentials(cfg.DNS.Provider, credentials); err != nil {
|
||||
s.writeReadinessFailure(c, "dns_credential_invalid")
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
@@ -58,8 +58,6 @@ type settingsDNSView struct {
|
||||
Provider string `json:"provider"`
|
||||
VerificationState string `json:"verification_state"`
|
||||
CredentialConfigured bool `json:"credential_configured"`
|
||||
UserScope *dnsprovider.AliyunScope `json:"user_scope,omitempty"`
|
||||
ScopeMessage string `json:"scope_message,omitempty"`
|
||||
}
|
||||
|
||||
type settingsNotificationView struct {
|
||||
@@ -167,22 +165,6 @@ func (s *Server) getSettings(c *gin.Context) {
|
||||
cfg := s.config
|
||||
s.configMu.RUnlock()
|
||||
view := settingsViewFromConfig(cfg)
|
||||
if cfg.DNS.Provider == dnsprovider.Aliyun {
|
||||
credentials, err := s.readDNSCredentials(c.Request.Context(), cfg.DNS.CredentialRef)
|
||||
if err == nil {
|
||||
scope, scopeErr := dnsprovider.ParseAliyunScope(credentials)
|
||||
if scopeErr == nil {
|
||||
view.DNS.UserScope = &scope
|
||||
} else {
|
||||
view.DNS.ScopeMessage = scopeErr.Error()
|
||||
}
|
||||
} else {
|
||||
view.DNS.ScopeMessage = "无法读取已保存授权范围,请检查凭据存储或重新验证"
|
||||
}
|
||||
if view.DNS.UserScope == nil {
|
||||
view.DNS.VerificationState = "scope_required"
|
||||
}
|
||||
}
|
||||
c.JSON(http.StatusOK, view)
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user