Skip to content

Allow auth token in query params also #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cpg merged 1 commit into from
Jul 16, 2018
Merged

Allow auth token in query params also #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions src/fs/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,17 @@ func use(h http.HandlerFunc, middleware ...func(http.HandlerFunc) http.HandlerFu
return h
}

func parseAuthToken(r *http.Request) (authToken string) {
authToken = r.Header.Get("Authorization")
if authToken == "" {
authToken = r.URL.Query().Get("auth")
}
return
}

func isAdmin(r *http.Request) bool {
// if Authorization header is not present, this is admin user
authToken := r.Header.Get("Authorization")
return authToken == ""
return parseAuthToken(r) == ""
}

func (service *MercuryFsService) authenticate(writer http.ResponseWriter, request *http.Request) {
Expand Down Expand Up @@ -60,13 +67,13 @@ func (service *MercuryFsService) authenticate(writer http.ResponseWriter, reques
}

func (service *MercuryFsService) logout(w http.ResponseWriter, r *http.Request) {
authToken := r.Header.Get("Authorization")
authToken := parseAuthToken(r)
service.Users.remove(authToken)
w.WriteHeader(http.StatusOK)
}

func (service *MercuryFsService) checkAuthHeader(w http.ResponseWriter, r *http.Request) (user *HdaUser) {
authToken := r.Header.Get("Authorization")
authToken := parseAuthToken(r)
user = service.Users.find(authToken)
// if user is nil, respond with 401 Unauthorized
if user == nil {
Expand Down