teach
/
adlin
Archived
0
0
Fork 0
Code Issues 1 Pull Requests 4 Releases Activity

Fix HMAC calculation
continuous-integration/drone/push Build is passing Details

This commit is contained in:
nemunaire 2022-02-19 15:30:26 +01:00
parent 173964a6fc
commit 21ef2f1372
5 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hmac-generator/main.go
View File

@ -15,5 +15,8 @@ func main() {
sharedSecret = os.Args[1]
}
fmt.Println(base64.StdEncoding.EncodeToString(hmac.New(sha512.New, []byte(sharedSecret)).Sum([]byte(fmt.Sprintf("%d", time.Now().Unix()/10)))))
h := hmac.New(sha512.New, []byte(sharedSecret))
h.Write([]byte(fmt.Sprintf("%d", time.Now().Unix()/10)))
fmt.Println(base64.StdEncoding.EncodeToString(h.Sum(nil)))
}

4
libadlin/students.go
View File

@ -68,7 +68,9 @@ func NewStudent(login string) (*Student, error) {
}
func (s *Student) GetPKey() []byte {
return hmac.New(sha512.New512_224, []byte(SharedSecret)).Sum([]byte(s.Login))
h := hmac.New(sha512.New512_224, []byte(SharedSecret))
h.Write([]byte(s.Login))
return h.Sum(nil)
}
func (s *Student) Update() (int64, error) {

5
pkg/login-validator/cmd/login.go
View File

@ -143,7 +143,10 @@ func (l loginChecker) registerUser(username, remoteAddr string, ent ARPEntry) (n
if err != nil {
return nil, err
}
req.Header.Add("X-ADLIN-Authentication", base64.StdEncoding.EncodeToString(hmac.New(sha512.New, []byte(loginSalt)).Sum([]byte(fmt.Sprintf("%d", time.Now().Unix()/10)))))
h := hmac.New(sha512.New, []byte(loginSalt))
h.Write([]byte(fmt.Sprintf("%d", time.Now().Unix()/10)))
req.Header.Add("X-ADLIN-Authentication", base64.StdEncoding.EncodeToString(h.Sum(nil)))
req.Header.Set("Content-Type", "application/json")
client := &http.Client{}

3
pkg/login-validator/cmd/pxetpl.go
View File

@ -36,6 +36,7 @@ func registerUser(tplPath string, filename string, username string, ip net.IP) e
defer userfd.Close()
pkey := hmac.New(sha512.New512_224, []byte(loginSalt))
pkey.Write([]byte(username))
if len(ip.To4()) != 4 {
return fmt.Errorf("Unable to assign a protected IP.")
@ -45,7 +46,7 @@ func registerUser(tplPath string, filename string, username string, ip net.IP) e
return err
} else if err := pxeTmpl.Execute(userfd, map[string]string{
"username": username,
"pkey": fmt.Sprintf("%x", pkey.Sum([]byte(username))),
"pkey": fmt.Sprintf("%x", pkey.Sum(nil)),
"ip": ip.String(),
}); err != nil {
return err

9
token-validator/handler.go
View File

@ -28,8 +28,13 @@ type DispatchFunction func(httprouter.Params, []byte) (interface{}, error)
func remoteValidatorHandler(f func(http.ResponseWriter, *http.Request, httprouter.Params)) func(http.ResponseWriter, *http.Request, httprouter.Params) {
return func(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
expectedMAC := hmac.New(sha512.New, []byte(adlin.SharedSecret)).Sum([]byte(fmt.Sprintf("%d", time.Now().Unix()/10)))
previousMAC := hmac.New(sha512.New, []byte(adlin.SharedSecret)).Sum([]byte(fmt.Sprintf("%d", time.Now().Unix()/10-1)))
h := hmac.New(sha512.New, []byte(adlin.SharedSecret))
h.Write([]byte(fmt.Sprintf("%d", time.Now().Unix()/10)))
expectedMAC := h.Sum(nil)
h = hmac.New(sha512.New, []byte(adlin.SharedSecret))
h.Write([]byte(fmt.Sprintf("%d", time.Now().Unix()/10-1)))
previousMAC := h.Sum(nil)
if aauth, err := base64.StdEncoding.DecodeString(r.Header.Get("X-ADLIN-Authentication")); err != nil {
http.Error(w, fmt.Sprintf("{\"errmsg\":%q}\n", err), http.StatusUnauthorized)