From d8b56042c3d13990dde096ef4ebd5d289b32e505 Mon Sep 17 00:00:00 2001 From: Noah Hsu Date: Mon, 8 Aug 2022 16:29:56 +0800 Subject: [PATCH] chore: ignore opt_secret while marshal --- internal/bootstrap/data/setting.go | 2 +- internal/model/user.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/bootstrap/data/setting.go b/internal/bootstrap/data/setting.go index ac9f1b45..5f58a13e 100644 --- a/internal/bootstrap/data/setting.go +++ b/internal/bootstrap/data/setting.go @@ -98,7 +98,7 @@ func initialSettings() { {Key: conf.CustomizeHead, Type: conf.TypeText, Group: model.GLOBAL, Flag: model.PRIVATE}, {Key: conf.CustomizeBody, Type: conf.TypeText, Group: model.GLOBAL, Flag: model.PRIVATE}, {Key: conf.LinkExpiration, Value: "0", Type: conf.TypeNumber, Group: model.GLOBAL, Flag: model.PRIVATE}, - {Key: conf.PrivacyRegs, Value: `(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?) + {Key: conf.PrivacyRegs, Value: `(?:(?:\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.){3}(?:\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]) ([[:xdigit:]]{1,4}(?::[[:xdigit:]]{1,4}){7}|::|:(?::[[:xdigit:]]{1,4}){1,6}|[[:xdigit:]]{1,4}:(?::[[:xdigit:]]{1,4}){1,5}|(?:[[:xdigit:]]{1,4}:){2}(?::[[:xdigit:]]{1,4}){1,4}|(?:[[:xdigit:]]{1,4}:){3}(?::[[:xdigit:]]{1,4}){1,3}|(?:[[:xdigit:]]{1,4}:){4}(?::[[:xdigit:]]{1,4}){1,2}|(?:[[:xdigit:]]{1,4}:){5}:[[:xdigit:]]{1,4}|(?:[[:xdigit:]]{1,4}:){1,6}:)`, Type: conf.TypeText, Group: model.GLOBAL, Flag: model.PRIVATE}, // aria2 settings diff --git a/internal/model/user.go b/internal/model/user.go index 28b762dc..b0a75867 100644 --- a/internal/model/user.go +++ b/internal/model/user.go @@ -28,8 +28,8 @@ type User struct { // 7: can remove // 8: webdav read // 9: webdav write - Permission int32 `json:"permission"` - OtpSecret string + Permission int32 `json:"permission"` + OtpSecret string `json:"-"` } func (u User) IsGuest() bool {