Display IP to use in login-app
This commit is contained in:
parent
8b06f62e90
commit
82f83e3d89
4 changed files with 36 additions and 35 deletions
|
|
@ -9,6 +9,7 @@ import (
|
|||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"log"
|
||||
"net"
|
||||
"net/http"
|
||||
|
|
@ -173,32 +174,29 @@ func (l loginChecker) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|||
}
|
||||
|
||||
// Register the user remotely
|
||||
if err := l.registerUser(lu.Username, r.RemoteAddr, *mac); err != nil {
|
||||
if ip, err := l.registerUser(lu.Username, r.RemoteAddr, *mac); err != nil {
|
||||
log.Println("Error on remote registration:", err)
|
||||
http.Error(w, "Internal server error. Please retry in a few minutes", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
// Generate PXE file
|
||||
if err := l.lateLoginAction(lu.Username, r.RemoteAddr, *mac); err != nil {
|
||||
} else if err := l.lateLoginAction(lu.Username, r.RemoteAddr, *mac); err != nil {
|
||||
log.Println("Error on late login action:", err)
|
||||
http.Error(w, "Internal server error. Please retry in a few minutes", http.StatusInternalServerError)
|
||||
return
|
||||
} else {
|
||||
log.Println("Successful login of", lu.Username, "at", r.RemoteAddr)
|
||||
http.Error(w, fmt.Sprintf("Use the following IP: %s", ip), http.StatusOK)
|
||||
}
|
||||
|
||||
log.Println("Successful login of", lu.Username, "at", r.RemoteAddr)
|
||||
http.Error(w, "Success", http.StatusOK)
|
||||
}
|
||||
|
||||
func (l loginChecker) registerUser(username, remoteAddr string, ent ARPEntry) error {
|
||||
func (l loginChecker) registerUser(username, remoteAddr string, ent ARPEntry) ([]byte, error) {
|
||||
bts, err := json.Marshal(map[string]interface{}{"login": username, "ip": remoteAddr, "mac": fmt.Sprintf("%02x:%02x:%02x:%02x:%02x:%02x", ent.HWAddress[0], ent.HWAddress[1], ent.HWAddress[2], ent.HWAddress[3], ent.HWAddress[4], ent.HWAddress[5])})
|
||||
if err != nil {
|
||||
return nil
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
req, err := http.NewRequest("POST", "https://adlin.nemunai.re/api/students/", bytes.NewReader(bts))
|
||||
if err != nil {
|
||||
return err
|
||||
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)))))
|
||||
req.Header.Set("Content-Type", "application/json")
|
||||
|
|
@ -206,13 +204,14 @@ func (l loginChecker) registerUser(username, remoteAddr string, ent ARPEntry) er
|
|||
client := &http.Client{}
|
||||
resp, err := client.Do(req)
|
||||
if err != nil {
|
||||
return err
|
||||
return nil, err
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
if resp.StatusCode != http.StatusOK {
|
||||
return errors.New(resp.Status)
|
||||
return nil, errors.New(resp.Status)
|
||||
} else {
|
||||
return nil
|
||||
return ioutil.ReadAll(resp.Body)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Reference in a new issue