Skip to content

Commit

Permalink
api auth fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@hunterlong
hunterlong committed Nov 30, 2018
1 parent 4e15799 commit 8897f2c
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 48 deletions.
26 changes: 2 additions & 24 deletions handlers/api.go
View file
Expand Up @@ -24,8 +24,6 @@ import (
"github.com/hunterlong/statup/types"
"github.com/hunterlong/statup/utils"
"net/http"
"os"
"strings"
)

type apiResponse struct {
Expand All @@ -38,7 +36,7 @@ type apiResponse struct {
}

func apiIndexHandler(w http.ResponseWriter, r *http.Request) {
if !isAuthorized(r) {
if !IsAuthenticated(r) {
sendUnauthorizedJson(w, r)
return
}
Expand All @@ -47,7 +45,7 @@ func apiIndexHandler(w http.ResponseWriter, r *http.Request) {
}

func apiRenewHandler(w http.ResponseWriter, r *http.Request) {
if !isAuthorized(r) {
if !IsAuthenticated(r) {
sendUnauthorizedJson(w, r)
return
}
Expand Down Expand Up @@ -130,23 +128,3 @@ func sendUnauthorizedJson(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusUnauthorized)
json.NewEncoder(w).Encode(output)
}

func isAuthorized(r *http.Request) bool {
utils.Http(r)
if os.Getenv("GO_ENV") == "test" {
return true
}
if IsAuthenticated(r) {
return true
}
var token string
tokens, ok := r.Header["Authorization"]
if ok && len(tokens) >= 1 {
token = tokens[0]
token = strings.TrimPrefix(token, "Bearer ")
}
if token == core.CoreApp.ApiSecret {
return true
}
return false
}
4 changes: 2 additions & 2 deletions handlers/checkin.go
View file
Expand Up @@ -27,7 +27,7 @@ import (
)

func apiAllCheckinsHandler(w http.ResponseWriter, r *http.Request) {
if !isAuthorized(r) {
if !IsAuthenticated(r) {
sendUnauthorizedJson(w, r)
return
}
Expand All @@ -41,7 +41,7 @@ func apiAllCheckinsHandler(w http.ResponseWriter, r *http.Request) {
}

func apiCheckinHandler(w http.ResponseWriter, r *http.Request) {
if !isAuthorized(r) {
if !IsAuthenticated(r) {
sendUnauthorizedJson(w, r)
return
}
Expand Down
14 changes: 12 additions & 2 deletions handlers/handlers.go
View file
Expand Up @@ -27,6 +27,7 @@ import (
"net/http"
"os"
"reflect"
"strings"
"time"
)

Expand Down Expand Up @@ -70,10 +71,19 @@ func IsAuthenticated(r *http.Request) bool {
return true
}
if core.CoreApp == nil {
return false
return true
}
if sessionStore == nil {
return false
return true
}
var token string
tokens, ok := r.Header["Authorization"]
if ok && len(tokens) >= 1 {
token = tokens[0]
token = strings.TrimPrefix(token, "Bearer ")
if token == core.CoreApp.ApiSecret {
return true
}
}
session, err := sessionStore.Get(r, cookieKey)
if err != nil {
Expand Down
10 changes: 5 additions & 5 deletions handlers/messages.go
View file
Expand Up @@ -50,7 +50,7 @@ func viewMessageHandler(w http.ResponseWriter, r *http.Request) {
}

func apiAllMessagesHandler(w http.ResponseWriter, r *http.Request) {
if !isAuthorized(r) {
if !IsAuthenticated(r) {
sendUnauthorizedJson(w, r)
return
}
Expand All @@ -64,7 +64,7 @@ func apiAllMessagesHandler(w http.ResponseWriter, r *http.Request) {
}

func apiMessageCreateHandler(w http.ResponseWriter, r *http.Request) {
if !isAuthorized(r) {
if !IsAuthenticated(r) {
sendUnauthorizedJson(w, r)
return
}
Expand All @@ -85,7 +85,7 @@ func apiMessageCreateHandler(w http.ResponseWriter, r *http.Request) {
}

func apiMessageGetHandler(w http.ResponseWriter, r *http.Request) {
if !isAuthorized(r) {
if !IsAuthenticated(r) {
sendUnauthorizedJson(w, r)
return
}
Expand All @@ -100,7 +100,7 @@ func apiMessageGetHandler(w http.ResponseWriter, r *http.Request) {
}

func apiMessageDeleteHandler(w http.ResponseWriter, r *http.Request) {
if !isAuthorized(r) {
if !IsAuthenticated(r) {
sendUnauthorizedJson(w, r)
return
}
Expand All @@ -119,7 +119,7 @@ func apiMessageDeleteHandler(w http.ResponseWriter, r *http.Request) {
}

func apiMessageUpdateHandler(w http.ResponseWriter, r *http.Request) {
if !isAuthorized(r) {
if !IsAuthenticated(r) {
sendUnauthorizedJson(w, r)
return
}
Expand Down
6 changes: 3 additions & 3 deletions handlers/notifications.go
View file
Expand Up @@ -27,7 +27,7 @@ import (
)

func apiNotifiersHandler(w http.ResponseWriter, r *http.Request) {
if !isAuthorized(r) {
if !IsAuthenticated(r) {
sendUnauthorizedJson(w, r)
return
}
Expand All @@ -41,7 +41,7 @@ func apiNotifiersHandler(w http.ResponseWriter, r *http.Request) {
}

func apiNotifierGetHandler(w http.ResponseWriter, r *http.Request) {
if !isAuthorized(r) {
if !IsAuthenticated(r) {
sendUnauthorizedJson(w, r)
return
}
Expand All @@ -56,7 +56,7 @@ func apiNotifierGetHandler(w http.ResponseWriter, r *http.Request) {
}

func apiNotifierUpdateHandler(w http.ResponseWriter, r *http.Request) {
if !isAuthorized(r) {
if !IsAuthenticated(r) {
sendUnauthorizedJson(w, r)
return
}
Expand Down
2 changes: 1 addition & 1 deletion handlers/plugins.go
View file
Expand Up @@ -27,7 +27,7 @@ type PluginSelect struct {
}

func pluginSavedHandler(w http.ResponseWriter, r *http.Request) {
if !isAuthorized(r) {
if !IsAuthenticated(r) {
http.Redirect(w, r, "/", http.StatusSeeOther)
return
}
Expand Down
2 changes: 1 addition & 1 deletion handlers/prometheus.go
View file
Expand Up @@ -33,7 +33,7 @@ import (
//

func prometheusHandler(w http.ResponseWriter, r *http.Request) {
if !isAuthorized(r) {
if !IsAuthenticated(r) {
http.Redirect(w, r, "/", http.StatusSeeOther)
return
}
Expand Down
10 changes: 5 additions & 5 deletions handlers/services.go
View file
Expand Up @@ -119,7 +119,7 @@ func servicesViewHandler(w http.ResponseWriter, r *http.Request) {
}

func apiServiceHandler(w http.ResponseWriter, r *http.Request) {
if !isAuthorized(r) {
if !IsAuthenticated(r) {
sendUnauthorizedJson(w, r)
return
}
Expand All @@ -135,7 +135,7 @@ func apiServiceHandler(w http.ResponseWriter, r *http.Request) {
}

func apiCreateServiceHandler(w http.ResponseWriter, r *http.Request) {
if !isAuthorized(r) {
if !IsAuthenticated(r) {
sendUnauthorizedJson(w, r)
return
}
Expand All @@ -156,7 +156,7 @@ func apiCreateServiceHandler(w http.ResponseWriter, r *http.Request) {
}

func apiServiceUpdateHandler(w http.ResponseWriter, r *http.Request) {
if !isAuthorized(r) {
if !IsAuthenticated(r) {
sendUnauthorizedJson(w, r)
return
}
Expand Down Expand Up @@ -220,7 +220,7 @@ func apiServicePingDataHandler(w http.ResponseWriter, r *http.Request) {
}

func apiServiceDeleteHandler(w http.ResponseWriter, r *http.Request) {
if !isAuthorized(r) {
if !IsAuthenticated(r) {
sendUnauthorizedJson(w, r)
return
}
Expand All @@ -239,7 +239,7 @@ func apiServiceDeleteHandler(w http.ResponseWriter, r *http.Request) {
}

func apiAllServicesHandler(w http.ResponseWriter, r *http.Request) {
if !isAuthorized(r) {
if !IsAuthenticated(r) {
sendUnauthorizedJson(w, r)
return
}
Expand Down
10 changes: 5 additions & 5 deletions handlers/users.go
View file
Expand Up @@ -48,7 +48,7 @@ func usersEditHandler(w http.ResponseWriter, r *http.Request) {
}

func apiUserHandler(w http.ResponseWriter, r *http.Request) {
if !isAuthorized(r) {
if !IsAuthenticated(r) {
sendUnauthorizedJson(w, r)
return
}
Expand All @@ -64,7 +64,7 @@ func apiUserHandler(w http.ResponseWriter, r *http.Request) {
}

func apiUserUpdateHandler(w http.ResponseWriter, r *http.Request) {
if !isAuthorized(r) {
if !IsAuthenticated(r) {
sendUnauthorizedJson(w, r)
return
}
Expand All @@ -88,7 +88,7 @@ func apiUserUpdateHandler(w http.ResponseWriter, r *http.Request) {
}

func apiUserDeleteHandler(w http.ResponseWriter, r *http.Request) {
if !isAuthorized(r) {
if !IsAuthenticated(r) {
sendUnauthorizedJson(w, r)
return
}
Expand All @@ -112,7 +112,7 @@ func apiUserDeleteHandler(w http.ResponseWriter, r *http.Request) {
}

func apiAllUsersHandler(w http.ResponseWriter, r *http.Request) {
if !isAuthorized(r) {
if !IsAuthenticated(r) {
sendUnauthorizedJson(w, r)
return
}
Expand All @@ -126,7 +126,7 @@ func apiAllUsersHandler(w http.ResponseWriter, r *http.Request) {
}

func apiCreateUsersHandler(w http.ResponseWriter, r *http.Request) {
if !isAuthorized(r) {
if !IsAuthenticated(r) {
sendUnauthorizedJson(w, r)
return
}
Expand Down

0 comments on commit 8897f2c

Please sign in to comment.