forked from metalogical/BigFiles
-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
add check #25
Merged
Merged
add check #25
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,16 @@ | ||
LFS_BUCKET: *********** | ||
CDN_DOMAIN: *********** | ||
OBS_REGION: *********** | ||
OBS_ACCESS_KEY_ID: *********** | ||
OBS_SECRET_ACCESS_KEY: *********** | ||
CLIENT_ID: *********** | ||
CLIENT_SECRET: *********** | ||
PATH_PREFIX: *********** | ||
{ | ||
"LFS_BUCKET": *********** | ||
"CDN_DOMAIN": *********** | ||
"OBS_REGION": *********** | ||
"OBS_ACCESS_KEY_ID": *********** | ||
"OBS_SECRET_ACCESS_KEY": *********** | ||
"CLIENT_ID": *********** | ||
"CLIENT_SECRET": *********** | ||
"PATH_PREFIX": *********** | ||
"VALIDATE_REGEXP": { | ||
"OWNER_REGEXP": "^[a-zA-Z]([-_.]?[a-zA-Z0-9]+)*$", | ||
"REPONAME_REGEXP": "^[a-zA-Z0-9_.-]{1,189}[a-zA-Z0-9]$", | ||
"USERNAME_REGEXP": "^[a-zA-Z]([-_.]?[a-zA-Z0-9]+)*$", | ||
"PASSWORD_REGEXP": "^[a-zA-Z0-9!@_#$%^&*()\\-=+,?.,]*$" | ||
} | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 此处改变了config文件格式,原因 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -88,6 +88,12 @@ func main() { | |
return | ||
} | ||
|
||
if err := server.Init(cfg.ValidateConfig); err != nil { | ||
logrus.Errorf("load ValidateConfig, err:%s", err.Error()) | ||
|
||
return | ||
} | ||
|
||
if err := auth.Init(cfg); err != nil { | ||
logrus.Errorf("load gitee config, err:%s", err.Error()) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 错误处理格式是否需要统一风格 |
||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
package server | ||
|
||
import ( | ||
"fmt" | ||
"github.com/metalogical/BigFiles/config" | ||
"regexp" | ||
) | ||
|
||
type validateConfig struct { | ||
ownerRegexp *regexp.Regexp | ||
reponameRegexp *regexp.Regexp | ||
usernameRegexp *regexp.Regexp | ||
passwordRegexp *regexp.Regexp | ||
} | ||
|
||
var validatecfg validateConfig | ||
|
||
func Init(cfg config.ValidateConfig) error { | ||
var err error | ||
validatecfg.ownerRegexp, err = regexp.Compile(cfg.OwnerRegexp) | ||
if err != nil { | ||
return fmt.Errorf("failed to compile owner regexp: %w", err) | ||
} | ||
|
||
validatecfg.reponameRegexp, err = regexp.Compile(cfg.RepoNameRegexp) | ||
if err != nil { | ||
return fmt.Errorf("failed to compile repo name regexp: %w", err) | ||
} | ||
|
||
validatecfg.usernameRegexp, err = regexp.Compile(cfg.UsernameRegexp) | ||
if err != nil { | ||
return fmt.Errorf("failed to compile username regexp: %w", err) | ||
} | ||
|
||
validatecfg.passwordRegexp, err = regexp.Compile(cfg.PasswordRegexp) | ||
if err != nil { | ||
return fmt.Errorf("failed to compile password regexp: %w", err) | ||
} | ||
|
||
return nil | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
username与ownername正则匹配格式相同,是否需要修改