forked from TripwireTeam/tripwire
hopefully fixed a funny
This commit is contained in:
parent
a9ea786279
commit
1b0d368d63
2 changed files with 50 additions and 38 deletions
68
db.go
68
db.go
|
@ -84,22 +84,36 @@ func getAuthToken(username string, password string) (string, error) {
|
||||||
return authToken, nil
|
return authToken, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func checkClientToken(clientToken string, userName string) (string, error) {
|
// func checkClientToken(clientToken string, userName string) (string, error) {
|
||||||
// assumes user is already logged in
|
// // assumes user is already logged in
|
||||||
sqlStatement := `
|
// sqlStatement := `
|
||||||
SELECT id FROM users WHERE client_token = ? AND username = ?;
|
// SELECT id FROM users WHERE client_token = ? AND username = ?;
|
||||||
`
|
// `
|
||||||
var x string
|
// var x string
|
||||||
err := DB.QueryRow(sqlStatement, clientToken, userName).Scan(&x)
|
// err := DB.QueryRow(sqlStatement, clientToken, userName).Scan(&x)
|
||||||
|
|
||||||
// check if row exists
|
// // check if row exists
|
||||||
if err != nil && err != sql.ErrNoRows {
|
// if err != nil && err != sql.ErrNoRows {
|
||||||
return "", err
|
// return "", err
|
||||||
}
|
// }
|
||||||
if err == nil {
|
// if err == nil {
|
||||||
return clientToken, nil
|
// return clientToken, nil
|
||||||
} else {
|
// } else {
|
||||||
clientToken = uuid.New().String()
|
// clientToken = uuid.New().String()
|
||||||
|
// sqlStatement := `
|
||||||
|
// UPDATE users SET client_token = ? WHERE username = ?;
|
||||||
|
// `
|
||||||
|
// _, err := DB.Exec(sqlStatement, clientToken, userName)
|
||||||
|
// if err != nil {
|
||||||
|
// return "", err
|
||||||
|
// }
|
||||||
|
// clearAuthToken(userName)
|
||||||
|
// return clientToken, nil
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
func checkClientToken(clientToken string, userName string) (string, error) {
|
||||||
|
// actually just stores the token instead of checking if it's valid
|
||||||
sqlStatement := `
|
sqlStatement := `
|
||||||
UPDATE users SET client_token = ? WHERE username = ?;
|
UPDATE users SET client_token = ? WHERE username = ?;
|
||||||
`
|
`
|
||||||
|
@ -107,22 +121,20 @@ func checkClientToken(clientToken string, userName string) (string, error) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
clearAuthToken(userName)
|
|
||||||
return clientToken, nil
|
return clientToken, nil
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func clearAuthToken(username string) error {
|
// func clearAuthToken(username string) error {
|
||||||
// runs when user logs out
|
// // runs when user logs out
|
||||||
sqlStatement := `
|
// sqlStatement := `
|
||||||
UPDATE users SET auth_token = ? WHERE username = ?;
|
// UPDATE users SET auth_token = ? WHERE username = ?;
|
||||||
`
|
// `
|
||||||
_, err := DB.Exec(sqlStatement, "", username)
|
// _, err := DB.Exec(sqlStatement, "", username)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
return err
|
// return err
|
||||||
}
|
// }
|
||||||
return nil
|
// return nil
|
||||||
}
|
// }
|
||||||
|
|
||||||
// func insertAuthToken(authToken string, userName string) error {
|
// func insertAuthToken(authToken string, userName string) error {
|
||||||
// sqlStatement := `
|
// sqlStatement := `
|
||||||
|
|
8
main.go
8
main.go
|
@ -7,10 +7,10 @@ import (
|
||||||
"github.com/gorilla/mux"
|
"github.com/gorilla/mux"
|
||||||
)
|
)
|
||||||
|
|
||||||
func notFoundStub(w http.ResponseWriter, r *http.Request) {
|
// func notFoundStub(w http.ResponseWriter, r *http.Request) {
|
||||||
err := YggError{Code: 404, Error: "Not Found", ErrorMessage: "The server has not found anything matching the request URI"}
|
// err := YggError{Code: 404, Error: "Not Found", ErrorMessage: "The server has not found anything matching the request URI"}
|
||||||
sendError(w, err)
|
// sendError(w, err)
|
||||||
}
|
// }
|
||||||
|
|
||||||
func handleRequests() {
|
func handleRequests() {
|
||||||
r := mux.NewRouter().StrictSlash(true)
|
r := mux.NewRouter().StrictSlash(true)
|
||||||
|
|
Loading…
Reference in a new issue