kelvin
/
web-server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:cactorium/kelvinly-server

This commit is contained in:
Kelvin Ly 2019-01-27 00:01:44 -05:00
parent 7b5b18a2b7 e3d834e2cd
commit 4321d69d40
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
main.go
View File

@ -195,13 +195,17 @@ func readWebhookKey() []byte {
log.Printf("[ERR] webhook key not found, webhook updates will not work!") log.Printf("[ERR] webhook key not found, webhook updates will not work!")
return nil return nil
} }
/*
ret := make([]byte, hex.DecodedLen(len(b))) ret := make([]byte, hex.DecodedLen(len(b)))
rl, err2 := hex.Decode(ret, b) // skip the ending 0x0a
rl, err2 := hex.Decode(ret, b[:len(b)-1])
if err2 != nil { if err2 != nil {
log.Printf("[ERR] unable to decode webhook key! %v %s", b, err2)
return nil return nil
} }
*/
return ret[:rl] return b[:len(b)-1]
} }
func startServer(srv *http.Server) { func startServer(srv *http.Server) {
@ -216,6 +220,7 @@ func startServer(srv *http.Server) {
serveMux.Handle("/resume/", http.StripPrefix("/resume", http.FileServer(http.Dir("resume/")))) serveMux.Handle("/resume/", http.StripPrefix("/resume", http.FileServer(http.Dir("resume/"))))
serveMux.HandleFunc("/main.css", func(w http.ResponseWriter, r *http.Request) { http.ServeFile(w, r, "main.css") }) serveMux.HandleFunc("/main.css", func(w http.ResponseWriter, r *http.Request) { http.ServeFile(w, r, "main.css") })
if webhookKey != nil { if webhookKey != nil {
log.Print("web hook found")
serveMux.HandleFunc("/update", func(w http.ResponseWriter, r *http.Request) { serveMux.HandleFunc("/update", func(w http.ResponseWriter, r *http.Request) {
if r.Method != "POST" { if r.Method != "POST" {
w.WriteHeader(403) w.WriteHeader(403)
@ -241,7 +246,8 @@ func startServer(srv *http.Server) {
expected := mac.Sum(nil) expected := mac.Sum(nil)
signatureDec := make([]byte, hex.DecodedLen(len(signature))) signatureDec := make([]byte, hex.DecodedLen(len(signature)))
sdl, e2 := hex.Decode(signatureDec, []byte(signature)) // skip the "sha1=" part
sdl, e2 := hex.Decode(signatureDec, []byte(signature)[5:])
if e2 != nil { if e2 != nil {
w.WriteHeader(403) w.WriteHeader(403)
w.Write([]byte("unable to read signature")) w.Write([]byte("unable to read signature"))
@ -250,7 +256,7 @@ func startServer(srv *http.Server) {
signatureDec = signatureDec[:sdl] signatureDec = signatureDec[:sdl]
if !hmac.Equal(expected, signatureDec) { if !hmac.Equal(expected, signatureDec) {
log.Print("webhook hmac match failed; expected %v found %v", expected, signature) log.Print("webhook hmac match failed; expected %v found %v", expected, signatureDec)
w.WriteHeader(403) w.WriteHeader(403)
w.Write([]byte("invalid request")) w.Write([]byte("invalid request"))
return return