From 5cec4353e5d52ea220541d5e197477a7105f80be Mon Sep 17 00:00:00 2001 From: samwaf Date: Tue, 6 Aug 2024 15:22:15 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=E7=A7=BB=E9=99=A4=E5=8E=9F=E6=9C=89?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- global/global.go | 2 +- localwaf/src/pages/waf/center/index.vue | 3 +- localwaf/src/pages/waf/license/index.vue | 2 +- localwaf/src/router/modules/waf.ts | 10 +--- vue/dist/index.html | 4 +- wafreg/client.go | 76 +++--------------------- 6 files changed, 17 insertions(+), 80 deletions(-) diff --git a/global/global.go b/global/global.go index 2fb71fc..0b99359 100644 --- a/global/global.go +++ b/global/global.go @@ -129,7 +129,7 @@ var ( GWAF_REG_KEY = []byte("5F!vion$k@a7QZ&)") //注册信息加密密钥 GWAF_REG_PUBLIC_KEY string = "" //注册信息加密公钥 GWAF_REG_TMP_REG []byte //用户传来的信息 - GWAF_REG_FREE_COUNT int64 = 3 //免费版授权用户数 + GWAF_REG_FREE_COUNT int64 = 99999 //免费版授权用户数 GWAF_REG_CUR_CLIENT_COUNT int64 = 3 //当前客户端用户数 ) diff --git a/localwaf/src/pages/waf/center/index.vue b/localwaf/src/pages/waf/center/index.vue index 42f7ac1..3bacf12 100644 --- a/localwaf/src/pages/waf/center/index.vue +++ b/localwaf/src/pages/waf/center/index.vue @@ -213,6 +213,7 @@ export default Vue.extend({ }, mounted() { this.getList("") + this.loadCurrentLicense() }, methods: { @@ -230,7 +231,7 @@ export default Vue.extend({ console.log(resdata) if (resdata.code === 0) { that.regData = resdata.data.license; - if(that.regData.username!="" && that.regData.is_expiry == true){ + if(that.regData.username!="" && that.regData.is_expiry == false){ that.isVip = true } } diff --git a/localwaf/src/pages/waf/license/index.vue b/localwaf/src/pages/waf/license/index.vue index b99c8f9..2f87007 100644 --- a/localwaf/src/pages/waf/license/index.vue +++ b/localwaf/src/pages/waf/license/index.vue @@ -24,7 +24,7 @@ 授权类型： 免费版 授权机器码： {{ clientData.machine_id }} - 授权数量： 3台 （需要升级请联系samwafgo@gmail.com我们进行商业授权） + 授权数量： 3台 上传文件 diff --git a/localwaf/src/router/modules/waf.ts b/localwaf/src/router/modules/waf.ts index bb6754f..f821a5f 100644 --- a/localwaf/src/router/modules/waf.ts +++ b/localwaf/src/router/modules/waf.ts @@ -177,20 +177,14 @@ export default [ name: 'center', component: Layout, redirect: '/center', - meta: { title: '集中管理', icon: ServerIcon }, + meta: { title: '设备管理', icon: ServerIcon }, children: [ { path: 'CenterManager', name: 'CenterManager', component: () => import('@/pages/waf/center/index.vue'), meta: { title: '设备列表' }, - }, - { - path: 'License', - name: 'License', - component: () => import('@/pages/waf/license/index.vue'), - meta: { title: '授权信息' }, - }, + } ], }, ]; diff --git a/vue/dist/index.html b/vue/dist/index.html index bc16a51..18bc932 100644 --- a/vue/dist/index.html +++ b/vue/dist/index.html @@ -6,8 +6,8 @@ SamWaf网站防火墙系统（Web Application Firewall） - - + +
diff --git a/wafreg/client.go b/wafreg/client.go index d3cb710..0a515f7 100644 --- a/wafreg/client.go +++ b/wafreg/client.go @@ -3,12 +3,9 @@ package wafreg import ( "SamWaf/global" "SamWaf/model" - "SamWaf/utils/zlog" "SamWaf/wafsec" - "bytes" "crypto/sha256" "encoding/base64" - "encoding/binary" "encoding/json" "errors" "fmt" @@ -60,72 +57,17 @@ func GenClientMachineInfoWithEncrypt() (string, error) { 校验注册服务信息 */ func VerifyServerReg(binData []byte) (success bool, info model.RegistrationInfo, err error) { - defer func() { - if err := recover(); err != nil { - zlog.Error("数据异常") - success = false - info = model.RegistrationInfo{} - err = errors.New("数据异常") - } - }() - //根据用户传来得数据信息 - cryptoUtil := &wafsec.CryptoUtil{} - publicKey := []byte(global.GWAF_REG_PUBLIC_KEY) - // 假设读取当前机器的机器码 - currentMachineInfo := GenClientMachineInfo() - - buffer := bytes.NewBuffer(binData) - - // 读取注册信息长度 - var dataLen int32 - err = binary.Read(buffer, binary.LittleEndian, &dataLen) - if err != nil { - return false, model.RegistrationInfo{}, errors.New("验签失败-读取注册信息长度失败") - } - - // 读取注册信息 - data := make([]byte, dataLen) - _, err = buffer.Read(data) - if err != nil { - return false, model.RegistrationInfo{}, errors.New("验签失败-读取注册信息失败") - } - - // 读取签名长度 - var sigLen int32 - err = binary.Read(buffer, binary.LittleEndian, &sigLen) - if err != nil { - return false, model.RegistrationInfo{}, errors.New("验签失败-读取签名长度失败") - } - - // 读取签名 - signature := make([]byte, sigLen) - _, err = buffer.Read(signature) - if err != nil { - return false, model.RegistrationInfo{}, errors.New("验签失败-读取签名失败") - } - - // 客户端验证签名 - signWithSha256Result := cryptoUtil.RsaVerySignWithSha256(data, signature, publicKey) - if !signWithSha256Result { - return false, model.RegistrationInfo{}, errors.New("验签失败") - } else { - decrypt, err := wafsec.AesDecrypt(string(data), global.GWAF_REG_KEY) - data = decrypt - // 解析数据 - var regInfo model.RegistrationInfo - err = json.Unmarshal(data, ®Info) - if err != nil { - return false, model.RegistrationInfo{}, errors.New("验签成功-转换json失败") - } - - // 验证机器码 - if regInfo.MachineID != currentMachineInfo.MachineID { - return false, model.RegistrationInfo{}, errors.New("验签成功-机器码不正确") - } else { - return true, regInfo, nil - } + //社区信息处理 + var regInfo = model.RegistrationInfo{ + Version: "v1", + Username: "user", + MemberType: "社区版", + MachineID: "", + ExpiryDate: time.Now().AddDate(1, 0, 0), + IsExpiry: false, } + return true, regInfo, nil } /*