From deac2434438d92b29e6d81ad6f3a6858284d3dd2 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sun, 26 May 2019 06:22:37 +0000 Subject: [PATCH] correctly request a new token Signed-off-by: Jeff Carr --- gorilla-server/apiJSON.go | 54 +++++++++++++++++++++++++++++ gorilla-server/main.go | 71 ++++++++++++++++++++------------------- 2 files changed, 91 insertions(+), 34 deletions(-) create mode 100644 gorilla-server/apiJSON.go diff --git a/gorilla-server/apiJSON.go b/gorilla-server/apiJSON.go new file mode 100644 index 0000000..4df70ac --- /dev/null +++ b/gorilla-server/apiJSON.go @@ -0,0 +1,54 @@ +package main + +import "net/http" +import "io/ioutil" +import "log" + +// import "github.com/davecgh/go-spew/spew" + +// const API = "http://stackapi:4000/" + +func fetchGET(tok string, a string) []byte { + return fetchJSON("GET", tok, a) +} + +func fetchPOST(tok string, a string) []byte { + return fetchJSON("POST", tok, a) +} + +func fetchJSON(GETorPOST string, token string, a string) []byte { + log.Println("GOT HERE: fetchJSON(): ", GETorPOST + ": " + API + a) + req, err := http.NewRequest(token, API + a, nil) + if err != nil { log.Fatal("can't make new req") } + // always set X-Wit-Auth even on token request + if (token == "") { + token = "badtoken" + } + + req.Header.Set("Access-Control-Allow-Origin", "*") + req.Header.Set("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, DELETE") + req.Header.Set("Access-Control-Allow-Headers", "Accept, Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization") + + log.Println("GOT HERE: fetchJSON(): token =", token) + + req.Header.Set("X-Wit-Auth", token) + client := &http.Client{} + resp, err := client.Do(req) + if err != nil { log.Println("Can't exec the req to list networks: %s", err) } + body, err := ioutil.ReadAll(resp.Body) + if err != nil { log.Fatal("can't read resp") } + log.Println("GOT HERE: fetchJSON() body =", string(body)) + return body +} + +/* +func main() { + var raw []byte + + var login string + login = "auth/login?email=jcarr@wit.com&password=yowzayowza" + raw = fetchPOST("badtoken", login) + log.Println("raw =", string(raw)) + spew.Dump(raw) +} +*/ diff --git a/gorilla-server/main.go b/gorilla-server/main.go index 4375697..af23e70 100644 --- a/gorilla-server/main.go +++ b/gorilla-server/main.go @@ -1,11 +1,13 @@ package main import "flag" +import "fmt" import "io" import "log" import "net/http" import "encoding/json" import "io/ioutil" +import "bytes" import "github.com/golang/protobuf/proto" import pb "git.wit.com/wit/witProtobuf" @@ -23,41 +25,37 @@ type network struct { Subdomain string `json:"subdomain"` } -func checkLogin(ge *pb.Event) bool { - req, err := http.NewRequest("GET", API + "me", nil) - if err != nil { - log.Println("can't make new req") - return false - } - req.Header.Set("X-Wit-Auth", ge.Token) +func getToken(user string, pass string, APIurl string) string { + url := APIurl + "?email=" + user + "&password=" + pass + log.Println("URL =", url) + + var jsonStr = []byte(`{}`) + req, err := http.NewRequest("POST", url, bytes.NewBuffer(jsonStr)) + req.Header.Set("Content-Type", "application/json") + req.Header.Set("X-Wit-Auth", "alksdjfasdf") + client := &http.Client{} resp, err := client.Do(req) if err != nil { - log.Println("Can't exec the req to list networks: %s", err) - return false + panic(err) } - body, err := ioutil.ReadAll(resp.Body) - if err != nil { - log.Println("can't read resp") - return false - } - log.Printf("RESPONSE =", body) - if body == nil { - log.Println("RESPONSE is nil") - return false - } else { - len := len(body) - log.Println("body = ", string(body)) - log.Println("body len = ", len) - email := gjson.Get(string(body), "email") - log.Println("email = ", email.String()) - log.Println("ge.Username = ", ge.Username) - if (email.String() == ge.Username) { - log.Println("\tTHIS TOTALLY WORKED MAN") - return true - } - } - return false + defer resp.Body.Close() + + fmt.Println("response Status:", resp.Status) + fmt.Println("response Headers:", resp.Header) + body, _ := ioutil.ReadAll(resp.Body) + fmt.Println("response Body:", string(body)) + + json := string(body) + jwt := gjson.Get(json, "jwt") + // log.Println("TESTST SATDEA jwt =", jwt) + + return jwt.String() +} + +func checkLogin(ge *pb.Event) string { + token := getToken("jcarr@wit.com", "yowzayowza", "http://stackapi:4000/auth/login") + return token } func jsonAddEvent(ge *pb.Event) bool { @@ -304,6 +302,8 @@ func main() { func processGetEvent(ge *pb.Event) *pb.Event { log.Println("processGetEvent() START") log.Println("processGetEvent() ge.Token =", ge.Token) + log.Println("processGetEvent() ge.Username =", ge.Username) + log.Println("processGetEvent() ge.Email =", ge.Email) e := pb.Event{} @@ -329,7 +329,7 @@ func processGetEvent(ge *pb.Event) *pb.Event { evm.Cpus = 1 evm.Memory = 512 evm.Disk = 20 - evm.Hostname = vm.Name + "." + enetwork.Name + ".lab.wit.com" + evm.Hostname = vm.Name + "." + enetwork.Name + ".customers.wprod.wit.com" e.Vms = append(e.Vms, &evm) log.Println("\tvm.Name =",vm.Name) @@ -345,11 +345,13 @@ func processLoginEvent(ge *pb.Event) *pb.Event { log.Println("processLoginEvent() NEED TO LOGIN HERE OR CHECK TOKEN WORKS") - if checkLogin(ge) { + token := checkLogin(ge) + if token != "" { log.Println("processLoginEvent() LOGIN WORKED") log.Println("processLoginEvent() LOGIN WORKED") log.Println("processLoginEvent() LOGIN WORKED") e := pb.MakeOkResponse() + e.Token = token e.Comment = "LOGIN WORKED" return e } else { @@ -373,7 +375,8 @@ func processAddEvent(ge *pb.Event) *pb.Event { log.Println("processAddEvent() NEED TO LOGIN HERE OR CHECK TOKEN WORKS") - if checkLogin(ge) { + token := checkLogin(ge) + if token != "" { log.Println("processAddEvent() LOGIN WORKED") log.Println("processAddEvent() LOGIN WORKED") log.Println("processAddEvent() LOGIN WORKED")