jcarr
/
dnssecsocket
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

start to clean code for interaction with protobuf structures 

Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
Jeff Carr 2019-05-28 04:29:55 +00:00
parent 82c4ac9c01
commit da12ea4087
2 changed files with 103 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
gorilla-server/apiJSON.go
View File

@ -8,53 +8,84 @@ import "bytes"
import "github.com/tidwall/gjson"
import pb "git.wit.com/wit/witProtobuf"
func fetchGET(tok string, a string) []byte {
return fetchJSON("GET", tok, a)
func fetchGET(token string, a string) []byte {
return fetchJSON("GET", token, a)
}
func fetchPOST(tok string, a string) []byte {
return fetchJSON("POST", tok, a)
func fetchPOST(token string, a string) []byte {
return fetchJSON("POST", token, 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") }
log.Println("GOT HERE: fetchJSON(): ", GETorPOST + ": " + a)
req, err := http.NewRequest(token, 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("X-Wit-Auth", token)
// needed to allow 'CORS' to work
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) }
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") }
if err != nil {
log.Fatal("can't read resp")
}
log.Println("GOT HERE: fetchJSON() body =", string(body))
return body
}
func updateToken(ge *pb.Event) bool {
if ge == nil {
log.Println("updateToken() has ge = nil")
ge.Comment = "updateToken() has ge = nil"
return false
}
if ge.Account == nil {
log.Println("updateToken() has ge.Account = nil")
ge.Comment = "updateToken() has ge.Account = nil"
return false
}
url := ge.Account.URL + "/auth/login" + "?email=" + ge.Account.Email + "&password=" + ge.Account.Password
log.Println("updateToken() URL =", url)
json := newFetchPOSTbody(ge, url)
jwt := gjson.Get(json, "jwt")
if (jwt.String() == "") {
ge.Comment = "updateToken() GOT TOKEN == nil"
log.Println("updateToken() ge.Comment =", ge.Comment)
return false
}
if (jwt.String() != ge.Account.Token) {
log.Println("updateToken() GOT NEW TOKEN", jwt)
ge.Account.Token = jwt.String()
}
log.Println("updateToken() END")
return true
}
// url := ge.Account.URL + "/auth/login" + "?email=" + ge.Account.Email + "&password=" + ge.Account.Password
func newFetchPOSTbody(ge *pb.Event, url string) string {
if ge == nil {
log.Println("newFetchPOSTbody() has ge = nil")
ge.Comment = "newFetchPOSTbody() has ge = nil"
return ""
}
if ge.Account == nil {
log.Println("newFetchPOSTbody() has ge.Account = nil")
ge.Comment = "newFetchPOSTbody() has ge.Account = nil"
return ""
}
log.Println("newFetchPOSTbody() URL =", url)
var jsonStr = []byte(`{}`)
req, err := http.NewRequest("POST", url, bytes.NewBuffer(jsonStr))
@ -66,26 +97,14 @@ func updateToken(ge *pb.Event) bool {
if err != nil {
log.Println(err)
ge.Comment = err.Error()
return false
return ""
}
defer resp.Body.Close()
body, _ := ioutil.ReadAll(resp.Body)
log.Println("updateToken() response Body:", string(body))
log.Println("updateToken() response Status:", resp.Status)
log.Println("updateToken() response Headers:", resp.Header)
log.Println("newFetchPOSTbody() response Body:", string(body))
log.Println("newFetchPOSTbody() response Status:", resp.Status)
log.Println("newFetchPOSTbody() response Headers:", resp.Header)
json := string(body)
jwt := gjson.Get(json, "jwt")
if (jwt.String() == "") {
log.Println("updateToken() GOT TOKEN == nil")
ge.Comment = string(body)
return false
}
if (jwt.String() != ge.Account.Token) {
log.Println("updateToken() GOT NEW TOKEN", jwt)
ge.Account.Token = jwt.String()
}
log.Println("updateToken() END")
return true
return string(body)
}

80
gorilla-server/main.go
View File

@ -13,11 +13,7 @@ import "github.com/gorilla/websocket"
import "github.com/davecgh/go-spew/spew"
import "github.com/tidwall/gjson"
const (
API = "http://stackapi:4000/"
MAX_NETS = 10
MAX_VMS = 10
)
// const API = "http://stackapi:4000/"
type network struct {
Subdomain string `json:"subdomain"`
@ -36,11 +32,11 @@ func checkLogin(ge *pb.Event) bool {
return updateToken(ge)
}
func fetchNetworks(token string) []network {
func fetchNetworks(ge *pb.Event) []network {
var networks []network
req, err := http.NewRequest("GET", API + "clusters", nil)
req, err := http.NewRequest("GET", ge.Account.URL + "clusters", nil)
if err != nil { log.Fatal("can't make new req") }
req.Header.Set("X-Wit-Auth", token)
req.Header.Set("X-Wit-Auth", ge.Account.Token)
client := &http.Client{}
resp, err := client.Do(req)
if err != nil { log.Printf("Can't exec the req to list networks: %s", err) }
@ -91,11 +87,11 @@ type vm struct {
BaseImage string `json:"base_image"`
}
func fetchVMs(token string, network string) []vm {
func fetchVMs(ge *pb.Event, network string) []vm {
var vms []vm
req, err := http.NewRequest("GET", API + "vms/" + network, nil)
req, err := http.NewRequest("GET", ge.Account.URL + "vms/" + network, nil)
if err != nil { log.Fatal("can't make new req") }
req.Header.Set("X-Wit-Auth", token)
req.Header.Set("X-Wit-Auth", ge.Account.Token)
client := &http.Client{}
resp, err := client.Do(req)
if err != nil { log.Printf("Can't exec the req to fetch vms for %s: %s", network, err) }
@ -120,11 +116,13 @@ var upgrader = websocket.Upgrader{
}
func sendProtobuf(conn *websocket.Conn, msg *pb.Event) {
log.Println("sendProtobuf() START")
data, _ := proto.Marshal(msg)
err := conn.WriteMessage(websocket.BinaryMessage, data)
if err != nil {
log.Println("sendProtobuf() write:", err)
}
log.Println("sendProtobuf() END")
}
func eventHandler(w http.ResponseWriter, r *http.Request) {
@ -161,21 +159,28 @@ func eventHandler(w http.ResponseWriter, r *http.Request) {
log.Println("\teventHandler() GOT websocket.BinaryMessage")
pdata := new(pb.Event)
var e *pb.Event
e = new(pb.Event)
err = proto.Unmarshal(message, pdata)
if (err != nil) {
log.Printf("readConn() something fucked up happened in Unmarshal")
}
log.Printf("\teventHandler()recv binary: %s", pdata)
log.Printf("\teventHandler() pdata.Type =", pdata.Type)
log.Printf("\teventHandler() recv binary: %s", pdata)
if pdata.Type == pb.Event_GET {
e = processGetEvent(pdata)
} else if pdata.Type == pb.Event_MIGRATE {
log.Printf("\teventHandler() DOING Event_GET")
e = processGetEvent(pdata)
} else if pdata.Type == pb.Event_LOGIN {
log.Printf("\teventHandler() DOING Event_LOGIN")
e = processLoginEvent(pdata)
} else if pdata.Type == pb.Event_ADD {
log.Printf("\teventHandler() DOING Event_ADD")
e = processAddEvent(pdata)
}
e.Comment = "eventHandler() GOT Event_" + pdata.Type.String()
if (e == nil) {
e = pb.MakeFailResponse()
e.Comment = "websocket.BinaryMessage LOGIN FAILED"
}
e.Account = pdata.Account
log.Println("\t", e.Comment)
sendProtobuf(conn, e)
}
@ -209,11 +214,12 @@ func main() {
}
}
// Gets a list of all the customer VM's
func processGetEvent(ge *pb.Event) *pb.Event {
log.Println("processGetEvent() START")
if (checkLogin(ge) == false) {
e := pb.MakeFailResponse()
e.Comment = "processGetEvent() LOGIN FAILED"
e.Comment = "processGetEvent() LOGIN FAILED on checkLogin(ge)"
log.Println(e.Comment)
return e
}
@ -223,11 +229,8 @@ func processGetEvent(ge *pb.Event) *pb.Event {
e := pb.Event{}
networks := fetchNetworks(ge.Account.Token)
for i, network := range(networks) {
if i >= MAX_NETS {
break
}
networks := fetchNetworks(ge)
for _, network := range(networks) {
log.Println("network.Subdomain =",network.Subdomain)
log.Println("network=",network)
enetwork := pb.Event_Network{}
@ -235,11 +238,8 @@ func processGetEvent(ge *pb.Event) *pb.Event {
e.Networks = append(e.Networks, &enetwork)
vms := fetchVMs(ge.Account.Token, network.Subdomain)
for j, vm := range(vms) {
if j >= MAX_VMS {
break
}
vms := fetchVMs(ge, network.Subdomain)
for _, vm := range(vms) {
evm := pb.Event_VM{}
evm.Name = vm.Name
evm.Cpus = 1
@ -255,6 +255,7 @@ func processGetEvent(ge *pb.Event) *pb.Event {
return &e
}
// should check a user can login here
func processLoginEvent(ge *pb.Event) *pb.Event {
log.Println("processLoginEvent() LOGIN START")
if (checkLogin(ge) == false) {
@ -272,10 +273,27 @@ func processLoginEvent(ge *pb.Event) *pb.Event {
}
func processAddEvent(ge *pb.Event) *pb.Event {
log.Println("processAddEvent() START")
log.Println("processAddLoginEvent() ge.Account.Token =", ge.Account.Token)
log.Println("processAddEvent() END")
return nil
log.Println("processAddEvent() START ge.Account =", ge.Account)
if (checkLogin(ge) == false) {
e := pb.MakeFailResponse()
e.Comment = "processAddEvent() LOGIN FAILED. ge.Account = nil"
log.Println(e.Comment)
return e
}
url := ge.Account.URL + "/vms/testing.com?count=1&cpu=2&ram=512&disk=25"
json := newFetchPOSTbody(ge, url)
log.Println("processAddEvent() recieved json=", json)
url = ge.Account.URL + "/vms/jcarr.com?count=1&cpu=2&ram=512&disk=25"
json = newFetchPOSTbody(ge, url)
log.Println("processAddEvent() recieved json=", json)
e := pb.MakeOkResponse()
e.Account = ge.Account
e.Comment = "processAddEvent() LOGIN WORKED"
log.Println(e.Comment)
return e
}
// This is the 'orig' code
@ -284,7 +302,7 @@ func origLoginCheck(ge *pb.Event) bool {
var url string
var httpType string
httpType = "GET"
url = API + "me"
url = ge.Account.URL + "me"
log.Println("origLoginCheck() ", httpType, url)
req, err := http.NewRequest(httpType, url, nil)