1.2.9 add WAF export and import merge branch 'dev'

Janusec · Apr 3, 2022 · 6a58e41 · 6a58e41
2 parents d629473 + a3c141e
commit 6a58e41
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 19 deletions.
diff --git a/data/data.go b/data/data.go
@@ -33,7 +33,7 @@ var (
 	// IsPrimary i.e. Is Primary Node
 	IsPrimary bool
 	// Version of JANUSEC
-	Version = "1.2.8"
+	Version = "1.2.9"
 	// NodeKey share with all nodes
 	NodeKey []byte
 )

diff --git a/firewall/cc.go b/firewall/cc.go
@@ -110,15 +110,10 @@ func GetCCPolicyRespByAppID(appID int64) (*models.CCPolicy, error) {
 
 // IsCCAttack to judge a request is CC attack, return IsCC, CCPolicy, ClientID, NeedLog
 func IsCCAttack(r *http.Request, app *models.Application, srcIP string) (bool, *models.CCPolicy, string, bool) {
-	isCC := false
 	ccPolicy := GetCCPolicyByAppID(app.ID)
-	if !ccPolicy.IsEnabled {
+	if !ccPolicy.IsEnabled || ccPolicy.Action == models.Action_Pass_400 {
 		return false, nil, "", false
 	}
-	if isCC {
-		clientID := data.SHA256Hash(srcIP)
-		return isCC, ccPolicy, clientID, false
-	}
 	ccAppID := app.ID
 	if ccPolicy.AppID == 0 {
 		ccAppID = 0 // Important: stat within general policy

diff --git a/firewall/group_policy.go b/firewall/group_policy.go
@@ -231,7 +231,7 @@ func InitGroupPolicy() {
 }
 
 // GetGroupPolicies ...
-func GetGroupPolicies(appID int64) ([]*models.GroupPolicy, error) {
+func GetGroupPolicies() ([]*models.GroupPolicy, error) {
 	return groupPolicies, nil
 }
 

diff --git a/gateway/api.go b/gateway/api.go
@@ -136,8 +136,7 @@ func AdminAPIHandlerFunc(w http.ResponseWriter, r *http.Request) {
 		obj = nil
 		err = firewall.UpdateCCPolicy(param, clientIP, authUser)
 	case "get_group_policies":
-		appID := int64(param["id"].(float64))
-		obj, err = firewall.GetGroupPolicies(appID)
+		obj, err = firewall.GetGroupPolicies()
 	case "get_group_policy":
 		id := int64(param["id"].(float64))
 		obj, err = firewall.GetGroupPolicyByID(id)
@@ -296,8 +295,7 @@ func ReplicaAPIHandlerFunc(w http.ResponseWriter, r *http.Request) {
 	case "get_cc_policies":
 		obj, err = firewall.GetCCPolicies()
 	case "get_group_policies":
-		appID := int64(param["id"].(float64))
-		obj, err = firewall.GetGroupPolicies(appID)
+		obj, err = firewall.GetGroupPolicies()
 	case "get_ip_policies":
 		obj, err = firewall.GetIPPolicies()
 	case "get_vuln_types":

diff --git a/gateway/gateway.go b/gateway/gateway.go
@@ -186,6 +186,8 @@ func ReverseHandlerFunc(w http.ResponseWriter, r *http.Request) {
 				captchaURL := CaptchaEntrance + "?id=" + hitInfo.ClientID
 				http.Redirect(w, r, captchaURL, http.StatusFound)
 				return
+			default:
+				// models.Action_Pass_400 do nothing
 			}
 		}
 	}

diff --git a/release_batch.sh b/release_batch.sh
@@ -2,7 +2,7 @@ printf "Creating installation package\n"
 printf "Checklist:\n"
 printf "* Angular Admin Version Check. \n"
 printf "* Janusec Version Check. \n"
-version="1.2.8"
+version="1.2.9"
 printf "Version: ${version} \n"
 
 read -r -p "Are You Sure? [Y/n] " option

diff --git a/static/janusec-admin/3rdpartylicenses.txt b/static/janusec-admin/3rdpartylicenses.txt
@@ -1764,7 +1764,7 @@ zone.js
 MIT
 The MIT License
 
-Copyright (c) 2010-2019 Google LLC. http://angular.io/license
+Copyright (c) 2010-2020 Google LLC. http://angular.io/license
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/static/janusec-admin/index.html b/static/janusec-admin/index.html
@@ -10,5 +10,5 @@
 <link rel="stylesheet" href="/janusec-admin/styles.50eb2ccb7b9839eeeaea.css"></head>
 <body>
   <app-root></app-root>
- <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.03b1d40a72dcdd5e459a.js" nomodule defer></script><script src="/janusec-admin/polyfills-es2015.7eb699264b8bb7fe3b46.js" type="module"></script><script src="/janusec-admin/main-es2015.33d3acb63a31942dbc62.js" type="module"></script><script src="/janusec-admin/main-es5.33d3acb63a31942dbc62.js" nomodule defer></script></body>
+ <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.debc6be9caecaca97982.js" nomodule defer></script><script src="/janusec-admin/polyfills-es2015.bd842007a68ebff28848.js" type="module"></script><script src="/janusec-admin/main-es2015.e9234abd6e9465c3c98f.js" type="module"></script><script src="/janusec-admin/main-es5.e9234abd6e9465c3c98f.js" nomodule defer></script></body>
 </html>
diff --git a/...admin/main-es2015.33d3acb63a31942dbc62.js → ...admin/main-es2015.e9234abd6e9465c3c98f.js b/...admin/main-es2015.33d3acb63a31942dbc62.js → ...admin/main-es2015.e9234abd6e9465c3c98f.js
diff --git a/static/janusec-admin/main-es5.33d3acb63a31942dbc62.js b/static/janusec-admin/main-es5.33d3acb63a31942dbc62.js
diff --git a/static/janusec-admin/main-es5.e9234abd6e9465c3c98f.js b/static/janusec-admin/main-es5.e9234abd6e9465c3c98f.js
diff --git a/static/janusec-admin/polyfills-es2015.7eb699264b8bb7fe3b46.js b/static/janusec-admin/polyfills-es2015.7eb699264b8bb7fe3b46.js
diff --git a/static/janusec-admin/polyfills-es2015.bd842007a68ebff28848.js b/static/janusec-admin/polyfills-es2015.bd842007a68ebff28848.js
diff --git a/...min/polyfills-es5.03b1d40a72dcdd5e459a.js → ...min/polyfills-es5.debc6be9caecaca97982.js b/...min/polyfills-es5.03b1d40a72dcdd5e459a.js → ...min/polyfills-es5.debc6be9caecaca97982.js