darkkirb/harness-drone
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #3068 from withshubh/master

Browse source 
fix code quality issues
This commit is contained in:
Marko Gaćeša 2021-06-29 11:23:50 +02:00 committed by GitHub
commit 6111a2559e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
handler/api/repos/encrypt/encrypt.go
View file

@ -71,7 +71,7 @@ func Handler(repos core.RepositoryStore) http.HandlerFunc {
} }
func encrypt(plaintext, key []byte) (ciphertext []byte, err error) { func encrypt(plaintext, key []byte) (ciphertext []byte, err error) {
block, err := aes.NewCipher(key[:]) block, err := aes.NewCipher(key)
if err != nil { if err != nil {
return nil, err return nil, err
} }

4
handler/web/login.go
View file

@ -179,7 +179,7 @@ func HandleLogin(
logger.Debugf("authentication successful") logger.Debugf("authentication successful")
session.Create(w, user) session.Create(w, user)
http.Redirect(w, r, redirect, 303) http.Redirect(w, r, redirect, http.StatusSeeOther)
} }
} }
@ -199,7 +199,7 @@ func synchronize(ctx context.Context, syncer core.Syncer, user *core.User) {
} }
func writeLoginError(w http.ResponseWriter, r *http.Request, err error) { func writeLoginError(w http.ResponseWriter, r *http.Request, err error) {
http.Redirect(w, r, "/login/error?message="+err.Error(), 303) http.Redirect(w, r, "/login/error?message="+err.Error(), http.StatusSeeOther)
} }
func writeLoginErrorStr(w http.ResponseWriter, r *http.Request, s string) { func writeLoginErrorStr(w http.ResponseWriter, r *http.Request, s string) {

4
metric/handler.go
View file

@ -44,9 +44,9 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
user, _ := s.session.Get(r) user, _ := s.session.Get(r)
switch { switch {
case !s.anonymous && user == nil: case !s.anonymous && user == nil:
http.Error(w, errInvalidToken.Error(), 401) http.Error(w, errInvalidToken.Error(), http.StatusUnauthorized)
case !s.anonymous && !user.Admin && !user.Machine: case !s.anonymous && !user.Admin && !user.Machine:
http.Error(w, errAccessDenied.Error(), 403) http.Error(w, errAccessDenied.Error(), http.StatusForbidden)
default: default:
s.metrics.ServeHTTP(w, r) s.metrics.ServeHTTP(w, r)
} }

2
plugin/registry/encrypted.go
View file

@ -99,7 +99,7 @@ func getEncrypted(manifest *yaml.Manifest, match string) (data string, ok bool)
} }
func decrypt(ciphertext []byte, key []byte) (plaintext []byte, err error) { func decrypt(ciphertext []byte, key []byte) (plaintext []byte, err error) {
block, err := aes.NewCipher(key[:]) block, err := aes.NewCipher(key)
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
plugin/secret/encrypted.go
View file

@ -97,7 +97,7 @@ func getEncrypted(manifest *yaml.Manifest, match string) (data string, ok bool)
} }
func decrypt(ciphertext []byte, key []byte) (plaintext []byte, err error) { func decrypt(ciphertext []byte, key []byte) (plaintext []byte, err error) {
block, err := aes.NewCipher(key[:]) block, err := aes.NewCipher(key)
if err != nil { if err != nil {
return nil, err return nil, err
} }

12
server/server.go
View file

@ -67,9 +67,7 @@ func (s Server) listenAndServe(ctx context.Context) error {
return s1.Shutdown(ctxShutdown) return s1.Shutdown(ctxShutdown)
}) })
g.Go(func() error { g.Go(s1.ListenAndServe)
return s1.ListenAndServe()
})
return g.Wait() return g.Wait()
} }
@ -83,9 +81,7 @@ func (s Server) listenAndServeTLS(ctx context.Context) error {
Addr: ":https", Addr: ":https",
Handler: s.Handler, Handler: s.Handler,
} }
g.Go(func() error { g.Go(s1.ListenAndServe)
return s1.ListenAndServe()
})
g.Go(func() error { g.Go(func() error {
return s2.ListenAndServeTLS( return s2.ListenAndServeTLS(
s.Cert, s.Cert,
@ -134,9 +130,7 @@ func (s Server) listenAndServeAcme(ctx context.Context) error {
MinVersion: tls.VersionTLS12, MinVersion: tls.VersionTLS12,
}, },
} }
g.Go(func() error { g.Go(s1.ListenAndServe)
return s1.ListenAndServe()
})
g.Go(func() error { g.Go(func() error {
return s2.ListenAndServeTLS("", "") return s2.ListenAndServeTLS("", "")
}) })