MetzNet
/
graphvent
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Return error for no auth

graph-rework-2
noah metz 2023-07-13 18:28:02 -06:00
parent 372c465472
commit d227331fe8
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gql.go
Unescape Escape View File

@ -125,6 +125,14 @@ func (e GQLUnauthorized) Error() string {
return fmt.Sprintf("GQL_UNAUTHORIZED_ERROR: %s", string(e)) return fmt.Sprintf("GQL_UNAUTHORIZED_ERROR: %s", string(e))
} }
func (e GQLUnauthorized) MarshalJSON() ([]byte, error) {
return json.MarshalIndent(&struct{
Error string `json:"error"`
}{
Error: string(e),
}, "", " ")
}
func checkForAuthHeader(header http.Header) (string, bool) { func checkForAuthHeader(header http.Header) (string, bool) {
auths, ok := header["Authorization"] auths, ok := header["Authorization"]
if ok == false { if ok == false {
@ -158,7 +166,9 @@ func GQLHandler(ctx * Context, server * GQLThread) func(http.ResponseWriter, *ht
ctx.Log.Logm("gql", header_map, "REQUEST_HEADERS") ctx.Log.Logm("gql", header_map, "REQUEST_HEADERS")
auth, ok := checkForAuthHeader(r.Header) auth, ok := checkForAuthHeader(r.Header)
if ok == false { if ok == false {
ctx.Log.Logf("gql", "GQL_REQUEST_ERR: no auth header included in request header") ctx.Log.Logf("gql", "GQL_REQUEST_ERR: no auth header included in request header")
json.NewEncoder(w).Encode(GQLUnauthorized("No TM Auth header provided"))
return return
} }
ctx.Log.Logf("gql", "GQL_AUTH: %s", auth) ctx.Log.Logf("gql", "GQL_AUTH: %s", auth)
@ -259,6 +269,7 @@ func GQLWSHandler(ctx * Context, server * GQLThread) func(http.ResponseWriter, *
auth, ok := checkForAuthHeader(r.Header) auth, ok := checkForAuthHeader(r.Header)
if ok == false { if ok == false {
ctx.Log.Logf("gql", "GQL_REQUEST_ERR: no auth header included in request header") ctx.Log.Logf("gql", "GQL_REQUEST_ERR: no auth header included in request header")
json.NewEncoder(w).Encode(GQLUnauthorized("No TM Auth header provided"))
return return
} }
ctx.Log.Logf("gql", "GQL_AUTH: %s", auth) ctx.Log.Logf("gql", "GQL_AUTH: %s", auth)