Forráskód Böngészése

Fixed view permission bug in system setting

tobychui 4 éve
szülő
commit
5085e5197b
3 módosított fájl, 9 hozzáadás és 2 törlés
  1. 1 1
      main.flags.go
  2. 7 1
      permission.go
  3. 1 0
      system.info.go

+ 1 - 1
main.flags.go

@@ -28,7 +28,7 @@ var subserviceBasePort = 12810            //Next subservice port
 
 // =========== SYSTEM BUILD INFORMATION ==============
 var build_version = "development"                      //System build flag, this can be either {development / production / stable}
-var internal_version = "0.1.117"                       //Internal build version, please follow git commit counter for setting this value. max value \[0-9].[0-9][0-9].[0-9][0-9][0-9]\
+var internal_version = "0.1.117"                       //Internal build version, [fork_id].[major_release_no].[minor_release_no]
 var deviceUUID string                                  //The device uuid of this host
 var deviceVendor = "IMUSLAB.INC"                       //Vendor of the system
 var deviceVendorURL = "http://imuslab.com"             //Vendor contact information

+ 7 - 1
permission.go

@@ -41,7 +41,13 @@ func permissionInit() {
 		} else {
 			//There are already users in the system. Only allow authorized users
 			if authAgent.CheckAuth(r) {
-				permissionHandler.HandleListGroup(w, r)
+				requestingUser, _ := userHandler.GetUserInfoFromRequest(w, r)
+				if requestingUser != nil && requestingUser.IsAdmin() == true {
+					permissionHandler.HandleListGroup(w, r)
+				} else {
+					errorHandleNotLoggedIn(w, r)
+				}
+
 			} else {
 				errorHandleNotLoggedIn(w, r)
 				return

+ 1 - 0
system.info.go

@@ -19,6 +19,7 @@ func SystemInfoInit() {
 
 	//Updates 5 Dec 2020, Added permission router
 	router := prout.NewModuleRouter(prout.RouterOption{
+		ModuleName:  "System Setting",
 		AdminOnly:   false,
 		UserHandler: userHandler,
 		DeniedHandler: func(w http.ResponseWriter, r *http.Request) {