Compare commits

..

2 Commits

Author SHA1 Message Date
12869d1ec0 Only enable debug logging if debug flag is set
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2023-06-09 12:33:39 -07:00
0341c7c6b3 Return generic error for incorrect webhook password 2023-06-09 12:32:40 -07:00
2 changed files with 7 additions and 2 deletions

View File

@ -41,6 +41,7 @@ var (
ErrInvalidHdrVal = errors.New("invalid header value type")
ErrInvalidType = errors.New("invalid type")
ErrInsecureWebhook = errors.New("secure webhook missing authorization")
ErrIncorrectPassword = errors.New("incorrect password")
)
var httpModule = &starlarkstruct.Module{
@ -355,7 +356,7 @@ func verifySecure(pwdHash, pluginName string, req *http.Request) error {
fmt.Println(string(pwd))
if err := bcrypt.CompareHashAndPassword([]byte(pwdHash), pwd); err != nil {
return err
return ErrIncorrectPassword
}
return nil

View File

@ -41,7 +41,6 @@ import (
func init() {
log.Logger = logger.NewPretty(os.Stderr)
log.Logger.SetLevel(logger.LogLevelDebug)
}
func main() {
@ -51,8 +50,13 @@ func main() {
serverAddr := pflag.StringP("address", "a", ":8080", "Webhook server address")
genHash := pflag.BoolP("gen-hash", "g", false, "Generate a password hash for webhooks")
useEnv := pflag.BoolP("use-env", "E", false, "Use environment variables for configuration")
debug := pflag.BoolP("debug", "d", false, "Enable debug logging")
pflag.Parse()
if *debug {
log.Logger.SetLevel(logger.LogLevelDebug)
}
if *genHash {
fmt.Print("Password: ")
pwd, err := term.ReadPassword(int(os.Stdin.Fd()))