Browse Source

去掉iframe配置

tags/v1.22.1.3^2
ychao_1983 3 years ago
parent
commit
71d279930f
2 changed files with 2 additions and 8 deletions
  1. +1
    -5
      modules/context/context.go
  2. +1
    -3
      modules/setting/setting.go

+ 1
- 5
modules/context/context.go View File

@@ -328,11 +328,7 @@ func Contexter() macaron.Handler {
}
}

if setting.IFrameURL != "" {
ctx.Resp.Header().Set(`X-Frame-Options`, `ALLOW-FROM `+setting.IFrameURL)
} else {
ctx.Resp.Header().Set(`X-Frame-Options`, `SAMEORIGIN`)
}
//ctx.Resp.Header().Set(`X-Frame-Options`, `SAMEORIGIN`)

ctx.Data["CsrfToken"] = html.EscapeString(x.GetToken())
ctx.Data["CsrfTokenHtml"] = template.HTML(`<input type="hidden" name="_csrf" value="` + ctx.Data["CsrfToken"].(string) + `">`)


+ 1
- 3
modules/setting/setting.go View File

@@ -573,7 +573,6 @@ var (
OrgName string
TeamName string
}{}
IFrameURL string
)

// DateLang transforms standard language locale name to corresponding value in datetime plugin.
@@ -1341,8 +1340,7 @@ func NewContext() {
sec = Cfg.Section("course")
Course.OrgName = sec.Key("org_name").MustString("")
Course.TeamName = sec.Key("team_name").MustString("")
sec = Cfg.Section("xFrame")
IFrameURL = sec.Key("url").MustString("")

}

func SetRadarMapConfig() {


Loading…
Cancel
Save