Skip to content

Commit 3386fc9

Browse files
janusec2janusec2
committed
add string escape to captcha confirm id and replace favicon, merge branch 'dev'
2 parents 111f694 + 6c82d7e commit 3386fc9

10 files changed

+14
-10
lines changed

Diff for: ‎gateway/gateway_response.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func rewriteResponse(resp *http.Response) (err error) {
8383
vulnName, _ := firewall.VulnMap.Load(policy.VulnID)
8484
hitInfo := &models.HitInfo{TypeID: 2, PolicyID: policy.ID, VulnName: vulnName.(string)}
8585
go firewall.LogGroupHitRequest(r, app.ID, srcIP, policy)
86-
blockContent := GenerateBlockConcent(hitInfo)
86+
blockContent := GenerateBlockContent(hitInfo)
8787
resp.StatusCode = 403
8888
resp.Body = io.NopCloser(bytes.NewBuffer(blockContent))
8989
resp.ContentLength = int64(len(blockContent))

Diff for: ‎gateway/waf_block.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ func GenerateBlockPage(w http.ResponseWriter, hitInfo *models.HitInfo) {
3131
}
3232
}
3333

34-
// GenerateBlockConcent ...
35-
func GenerateBlockConcent(hitInfo *models.HitInfo) []byte {
34+
// GenerateBlockContent ...
35+
func GenerateBlockContent(hitInfo *models.HitInfo) []byte {
3636
if tmplBlockResp == nil {
3737
tmplBlockResp, _ = template.New("blockResp").Parse(data.NodeSetting.BlockHTML)
3838
}
3939
buf := &bytes.Buffer{}
4040
err := tmplBlockResp.Execute(buf, hitInfo)
4141
if err != nil {
42-
utils.DebugPrintln("GenerateBlockConcent tmpl.Execute error", err)
42+
utils.DebugPrintln("GenerateBlockContent tmpl.Execute error", err)
4343
}
4444
return buf.Bytes()
4545
}

Diff for: ‎gateway/waf_captcha.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
package gateway
99

1010
import (
11+
"html"
1112
"net/http"
1213
"sync"
1314
"text/template"
@@ -32,7 +33,7 @@ const (
3233
// ShowCaptchaHandlerFunc ...
3334
func ShowCaptchaHandlerFunc(w http.ResponseWriter, r *http.Request) {
3435
go ClearExpiredCapthchaHitInfo()
35-
id := r.FormValue("id")
36+
id := html.EscapeString(r.FormValue("id"))
3637
captchaContext := models.CaptchaContext{CaptchaId: captcha.New(), ClientID: id}
3738
if err := formTemplate.Execute(w, &captchaContext); err != nil {
3839
http.Error(w, err.Error(), http.StatusInternalServerError)

Diff for: ‎static/janusec-admin/assets/images/favicon.ico

1.58 KB
Binary file not shown.

Diff for: ‎static/janusec-admin/assets/images/gateway2.png

-72 KB
Binary file not shown.

Diff for: ‎static/janusec-admin/assets/images/logo.png

-965 Bytes
Loading

Diff for: ‎static/janusec-admin/favicon.ico

1.58 KB
Binary file not shown.

Diff for: ‎static/janusec-admin/index.html

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
<!doctype html>
22
<html lang="en">
3+
34
<head><base href="/janusec-admin/">
45
<meta charset="utf-8">
5-
<title>JANUSEC</title>
6+
<title>Janusec Application Gateway</title>
67
<meta name="viewport" content="width=device-width, initial-scale=1">
78
<meta http-equiv="Content-Security-Policy" content="img-src 'self' data:;" />
89
<link href="/janusec-admin/assets/material-icons/material-icons.css" rel="stylesheet">
910
<link rel="icon" type="image/x-icon" href="favicon.ico">
1011
<link rel="stylesheet" href="/janusec-admin/styles.5b315bea3caf382abdf2.css"></head>
12+
1113
<body>
1214
<app-root></app-root>
13-
<script src="/janusec-admin/runtime-es2015.871528d607deca2f7955.js" type="module"></script><script src="/janusec-admin/runtime-es5.871528d607deca2f7955.js" nomodule defer></script><script src="/janusec-admin/polyfills-es5.aa2ca4297f425c58cd1c.js" nomodule defer></script><script src="/janusec-admin/polyfills-es2015.bf3b0982128d918baf6a.js" type="module"></script><script src="/janusec-admin/main-es2015.3d249a116c0e53e1af34.js" type="module"></script><script src="/janusec-admin/main-es5.3d249a116c0e53e1af34.js" nomodule defer></script></body>
14-
</html>
15+
<script src="/janusec-admin/runtime-es2015.871528d607deca2f7955.js" type="module"></script><script src="/janusec-admin/runtime-es5.871528d607deca2f7955.js" nomodule defer></script><script src="/janusec-admin/polyfills-es5.aa2ca4297f425c58cd1c.js" nomodule defer></script><script src="/janusec-admin/polyfills-es2015.bf3b0982128d918baf6a.js" type="module"></script><script src="/janusec-admin/main-es2015.9b510fd27c80e2436f66.js" type="module"></script><script src="/janusec-admin/main-es5.9b510fd27c80e2436f66.js" nomodule defer></script></body>
16+
17+
</html>

Diff for: ‎static/janusec-admin/main-es2015.3d249a116c0e53e1af34.js renamed to ‎static/janusec-admin/main-es2015.9b510fd27c80e2436f66.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎static/janusec-admin/main-es5.3d249a116c0e53e1af34.js renamed to ‎static/janusec-admin/main-es5.9b510fd27c80e2436f66.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)