Log in
+ {{ if .Info }}
+
{{ .Info }}
+ {{ end }}
{{ if .Error }}
{{ .Error }}
{{ end }}
diff --git a/internal/web/templates/sweatbox_manual.html b/internal/web/templates/sweatbox_manual.html
index d0299a7..33a40ad 100644
--- a/internal/web/templates/sweatbox_manual.html
+++ b/internal/web/templates/sweatbox_manual.html
@@ -41,7 +41,7 @@
The sweatbox is a native, in-process simulator inside the FSD process.
Aircraft are synthetic registry participants (no TCP pilot sockets). You drive them
- from the Administrator web page at /sweatbox with text commands that
+ from the Instructor1+ web page at /sweatbox with text commands that
follow TWRTrainer-style vocabulary.
@@ -60,7 +60,7 @@
| Role |
- Administrator network rating (same as Config / Airport Editor). |
+ Instructor1+ network rating (I1, I2, I3, SUP, ADM). Config and Airport Editor remain Administrator-only. |
| FSD process |
diff --git a/internal/web/user.go b/internal/web/user.go
index d6940b5..475e6ea 100644
--- a/internal/web/user.go
+++ b/internal/web/user.go
@@ -12,7 +12,7 @@ import (
// getUserByCID returns the user info of the specified CID.
//
-// Self always allowed. Other CIDs require Instructor1+ (directory / rating tooling).
+// Self always allowed. Other CIDs require Supervisor+ (user editor).
func (s *Server) getUserByCID(c *gin.Context) {
type RequestBody struct {
CID int `json:"cid" binding:"min=1,required"`
@@ -65,8 +65,8 @@ func (s *Server) getUserByCID(c *gin.Context) {
// updateUser updates the user with a specified CID.
//
// The CID itself is immutable and cannot be changed.
-// Instructor1+: may set network_rating and pilot_rating up to actor ceilings (any target).
-// Supervisor+: may also set name/password when target network rating ≤ actor.
+// Supervisor+: may set network_rating (≤ actor) and any official pilot_rating (any target);
+// may also set name/password when target network rating ≤ actor.
func (s *Server) updateUser(c *gin.Context) {
claims, ok := requireJwtContext(c)
if !ok {
@@ -97,7 +97,6 @@ func (s *Server) updateUser(c *gin.Context) {
return
}
- actorPilotMax := s.actorPilotRatingCeiling(claims.CID)
fullOK := canFullMutateTarget(claims.NetworkRating, protocol.NetworkRating(targetUser.NetworkRating))
// Profile fields require full mutation privilege.
@@ -120,8 +119,9 @@ func (s *Server) updateUser(c *gin.Context) {
}
}
- // Rating ceilings: cannot *raise/change to* above actor's own values (any target).
+ // Network ceiling: cannot raise/change to above actor's own (any target).
// Unchanged higher existing values are allowed when the field is re-sent as-is.
+ // Pilot: full official scale (KD-6) — no actor pilot ceiling.
if reqBody.NetworkRating != nil {
if *reqBody.NetworkRating > int(claims.NetworkRating) &&
*reqBody.NetworkRating != targetUser.NetworkRating {
@@ -137,12 +137,6 @@ func (s *Server) updateUser(c *gin.Context) {
writeAPIV1Response(c, http.StatusBadRequest, &res)
return
}
- if *reqBody.PilotRating > actorPilotMax &&
- *reqBody.PilotRating != targetUser.PilotRating {
- res := newAPIV1Failure("cannot set pilot rating above your own")
- writeAPIV1Response(c, http.StatusForbidden, &res)
- return
- }
targetUser.PilotRating = *reqBody.PilotRating
}
@@ -205,12 +199,6 @@ func (s *Server) createUser(c *gin.Context) {
writeAPIV1Response(c, http.StatusBadRequest, &res)
return
}
- actorPilotMax := s.actorPilotRatingCeiling(claims.CID)
- if reqBody.PilotRating > actorPilotMax {
- res := newAPIV1Failure("cannot set pilot rating above your own")
- writeAPIV1Response(c, http.StatusForbidden, &res)
- return
- }
user := &db.User{
Password: reqBody.Password,
diff --git a/internal/web/user_authz.go b/internal/web/user_authz.go
index f709d1e..b66f1a8 100644
--- a/internal/web/user_authz.go
+++ b/internal/web/user_authz.go
@@ -1,26 +1,30 @@
package web
import (
+ "strings"
+
"github.com/renorris/openfsd/pkg/protocol"
)
-// User-admin privilege helpers.
+// User-admin privilege helpers (post user-dashboard self-service design).
//
-// - Instructor1–3 (and above): browse directory; adjust network + pilot ratings
-// up to the actor's own ceilings (any target).
-// - Supervisor+: full mutation (create, name, password) in addition to ratings.
+// - Supervisor+: user editor directory, create, rating + full profile mutation.
// Full profile mutation still cannot target users with a higher network rating.
+// - Instructor1+: sweatbox control plane (HTML + PE JSON).
+// - Administrator: config + airport editor (unchanged).
func canAccessUserEditor(r protocol.NetworkRating) bool {
- return r >= protocol.NetworkRatingInstructor1
+ return r >= protocol.NetworkRatingSupervisor
}
func canFullMutateUsers(r protocol.NetworkRating) bool {
return r >= protocol.NetworkRatingSupervisor
}
+// canAdjustUserRatings gates JSON updateUser and rating POSTs. Same threshold
+// as canAccessUserEditor (SUP+) after the I1 rating-only tier was removed.
func canAdjustUserRatings(r protocol.NetworkRating) bool {
- return r >= protocol.NetworkRatingInstructor1
+ return r >= protocol.NetworkRatingSupervisor
}
// canFullMutateTarget is true when the actor may change name/password (and
@@ -29,6 +33,10 @@ func canFullMutateTarget(actor, targetNetworkRating protocol.NetworkRating) bool
return canFullMutateUsers(actor) && targetNetworkRating <= actor
}
+func canAccessSweatbox(r protocol.NetworkRating) bool {
+ return r >= protocol.NetworkRatingInstructor1
+}
+
func pilotRatingLabel(v int) string {
// "PPL — Private Pilot License" style for selects / tooltips.
short := protocol.PilotRatingShort(v)
@@ -63,6 +71,13 @@ func pilotRatingOptionsUpTo(maxInclusive int, selected int) []ratingOption {
return out
}
+// pilotRatingOptionsAll returns the full official pilot scale (P0…FE).
+// Used by the user editor so SUP+ can assign any pilot rating regardless of
+// their own flying quals (KD-6).
+func pilotRatingOptionsAll(selected int) []ratingOption {
+ return pilotRatingOptionsUpTo(int(protocol.PilotRatingFE), selected)
+}
+
// maxValidPilotRatingAtMost returns the highest official pilot rating ID ≤ n.
// If n is below P0, returns P0.
func maxValidPilotRatingAtMost(n int) int {
@@ -79,3 +94,15 @@ func maxValidPilotRatingAtMost(n int) int {
func isValidPilotRating(v int) bool {
return protocol.IsValidPilotRating(v)
}
+
+// validateNewPassword returns a user-visible error string, or "" if OK.
+// Used by account change-password and user-editor create/update (when password non-empty).
+func validateNewPassword(pw string) string {
+ if len(pw) < 8 {
+ return "Password must be at least 8 characters"
+ }
+ if strings.Contains(pw, ":") {
+ return "Password cannot contain colon characters"
+ }
+ return ""
+}