|
@@ -17,7 +17,7 @@ import (
|
|
|
|
|
|
func enrollmentKeyHandlers(r *mux.Router) {
|
|
func enrollmentKeyHandlers(r *mux.Router) {
|
|
r.HandleFunc("/api/v1/enrollment-keys", logic.SecurityCheck(true, http.HandlerFunc(createEnrollmentKey))).Methods(http.MethodPost)
|
|
r.HandleFunc("/api/v1/enrollment-keys", logic.SecurityCheck(true, http.HandlerFunc(createEnrollmentKey))).Methods(http.MethodPost)
|
|
- r.HandleFunc("/api/v1/enrollment-keys", logic.SecurityCheck(true, http.HandlerFunc(getEnrollmentKeys))).Methods(http.MethodGet)
|
|
|
|
|
|
+ r.HandleFunc("/api/v1/enrollment-keys", logic.SecurityCheck(false, http.HandlerFunc(getEnrollmentKeys))).Methods(http.MethodGet)
|
|
r.HandleFunc("/api/v1/enrollment-keys/{keyID}", logic.SecurityCheck(true, http.HandlerFunc(deleteEnrollmentKey))).Methods(http.MethodDelete)
|
|
r.HandleFunc("/api/v1/enrollment-keys/{keyID}", logic.SecurityCheck(true, http.HandlerFunc(deleteEnrollmentKey))).Methods(http.MethodDelete)
|
|
r.HandleFunc("/api/v1/host/register/{token}", http.HandlerFunc(handleHostRegister)).Methods(http.MethodPost)
|
|
r.HandleFunc("/api/v1/host/register/{token}", http.HandlerFunc(handleHostRegister)).Methods(http.MethodPost)
|
|
}
|
|
}
|
|
@@ -34,24 +34,37 @@ func enrollmentKeyHandlers(r *mux.Router) {
|
|
// Responses:
|
|
// Responses:
|
|
// 200: getEnrollmentKeysSlice
|
|
// 200: getEnrollmentKeysSlice
|
|
func getEnrollmentKeys(w http.ResponseWriter, r *http.Request) {
|
|
func getEnrollmentKeys(w http.ResponseWriter, r *http.Request) {
|
|
- currentKeys, err := logic.GetAllEnrollmentKeys()
|
|
|
|
|
|
+ keys, err := logic.GetAllEnrollmentKeys()
|
|
if err != nil {
|
|
if err != nil {
|
|
logger.Log(0, r.Header.Get("user"), "failed to fetch enrollment keys: ", err.Error())
|
|
logger.Log(0, r.Header.Get("user"), "failed to fetch enrollment keys: ", err.Error())
|
|
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
|
|
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
|
|
return
|
|
return
|
|
}
|
|
}
|
|
- for i := range currentKeys {
|
|
|
|
- currentKey := currentKeys[i]
|
|
|
|
- if err = logic.Tokenize(currentKey, servercfg.GetAPIHost()); err != nil {
|
|
|
|
|
|
+ isMasterAdmin := r.Header.Get("ismaster") == "yes"
|
|
|
|
+ // regular user flow
|
|
|
|
+ user, err := logic.GetUser(r.Header.Get("user"))
|
|
|
|
+ if err != nil && !isMasterAdmin {
|
|
|
|
+ logger.Log(0, r.Header.Get("user"), "failed to fetch user: ", err.Error())
|
|
|
|
+ logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ // TODO drop double pointer
|
|
|
|
+ ret := []*models.EnrollmentKey{}
|
|
|
|
+ for _, key := range keys {
|
|
|
|
+ if !isMasterAdmin && !logic.UserHasNetworksAccess(key.Networks, user) {
|
|
|
|
+ continue
|
|
|
|
+ }
|
|
|
|
+ if err = logic.Tokenize(key, servercfg.GetAPIHost()); err != nil {
|
|
logger.Log(0, r.Header.Get("user"), "failed to get token values for keys:", err.Error())
|
|
logger.Log(0, r.Header.Get("user"), "failed to get token values for keys:", err.Error())
|
|
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
|
|
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
+ ret = append(ret, key)
|
|
}
|
|
}
|
|
// return JSON/API formatted keys
|
|
// return JSON/API formatted keys
|
|
logger.Log(2, r.Header.Get("user"), "fetched enrollment keys")
|
|
logger.Log(2, r.Header.Get("user"), "fetched enrollment keys")
|
|
w.WriteHeader(http.StatusOK)
|
|
w.WriteHeader(http.StatusOK)
|
|
- json.NewEncoder(w).Encode(currentKeys)
|
|
|
|
|
|
+ json.NewEncoder(w).Encode(ret)
|
|
}
|
|
}
|
|
|
|
|
|
// swagger:route DELETE /api/v1/enrollment-keys/{keyID} enrollmentKeys deleteEnrollmentKey
|
|
// swagger:route DELETE /api/v1/enrollment-keys/{keyID} enrollmentKeys deleteEnrollmentKey
|