优化代码

server/dbdata/user.go

@@ -86,16 +86,7 @@ func CheckUser(name, pwd, group string) error {
 	case "", "local":
 		return checkLocalUser(name, pwd, group)
 	case "radius":
-		radisConf := AuthRadius{}
-		bodyBytes, err := json.Marshal(groupData.Auth["radius"])
-		if err != nil {
-			fmt.Errorf("%s %s", name, "Radius出现Marshal错误")
-		}
-		err = json.Unmarshal(bodyBytes, &radisConf)
-		if err != nil {
-			fmt.Errorf("%s %s", name, "Radius出现Unmarshal错误")
-		}
-		return checkRadiusUser(name, pwd, radisConf)
+		return checkRadiusUser(name, pwd, groupData.Auth)
 	default:
 		return fmt.Errorf("%s %s", name, "无效的认证类型")
 	}
@@ -144,13 +135,26 @@ func checkLocalUser(name, pwd, group string) error {
 	return nil
 }
 
-func checkRadiusUser(name string, pwd string, raduisConf AuthRadius) error {
-	packet := radius.New(radius.CodeAccessRequest, []byte(raduisConf.Secret))
+func checkRadiusUser(name string, pwd string, auth map[string]interface{}) error {
+	if _, ok := auth["radius"]; !ok {
+		fmt.Errorf("%s %s", name, "Radius的radius值不存在")
+	}
+	radiusConf := AuthRadius{}
+	bodyBytes, err := json.Marshal(auth["radius"])
+	if err != nil {
+		fmt.Errorf("%s %s", name, "Radius Marshal出现错误")
+	}
+	err = json.Unmarshal(bodyBytes, &radiusConf)
+	if err != nil {
+		fmt.Errorf("%s %s", name, "Radius Unmarshal出现错误")
+	}
+	// radius认证时，设置超时3秒
+	packet := radius.New(radius.CodeAccessRequest, []byte(radiusConf.Secret))
 	rfc2865.UserName_SetString(packet, name)
 	rfc2865.UserPassword_SetString(packet, pwd)
 	ctx, done := context.WithTimeout(context.Background(), 3*time.Second)
 	defer done()
-	response, err := radius.Exchange(ctx, packet, raduisConf.Addr)
+	response, err := radius.Exchange(ctx, packet, radiusConf.Addr)
 	if err != nil {
 		return fmt.Errorf("%s %s", name, "Radius服务器连接异常, 请检测服务器和端口")
 	}