Started reworking skaldctl. Give room status along with room name.

hall/description.go

@@ -18,6 +18,13 @@ import (
 var ErrTagMismatch = errors.New("tag mismatch")
 var ErrDescriptionsNotWritable = &NotAuthorisedError{}
 var ErrUnknownPermission = errors.New("unknown permission")
+var localAdministration bool
+
+// SetLocalAdministration allows a local administration tool to update hall
+// files without enabling writes through the server's HTTP API.
+func SetLocalAdministration(enabled bool) {
+	localAdministration = enabled
+}
 
 type Permissions struct {
 	// non-empty for a named permissions set
@@ -338,6 +345,9 @@ func makeETag(fileSize int64, modTime time.Time) string {
 // DeleteDescription deletes a description (and therefore persistently
 // deletes a hall) but only if it matches a given ETag.
 func DeleteDescription(name, etag string) error {
+	if !validHallName(name) {
+		return UserError("illegal hall name")
+	}
 	halls.mu.Lock()
 	defer halls.mu.Unlock()
 
@@ -357,7 +367,22 @@ func UpdateDescription(name, etag string, desc *Description) error {
 	if desc.Users != nil || desc.WildcardUser != nil || desc.AuthKeys != nil {
 		return errors.New("description is not sanitised")
 	}
+	return updateDescription(name, etag, desc, true)
+}
 
+// WriteDescription writes a full hall description from a local administration
+// tool. It is not available to the server's HTTP API.
+func WriteDescription(name, etag string, desc *Description) error {
+	if !localAdministration {
+		return ErrDescriptionsNotWritable
+	}
+	return updateDescription(name, etag, desc, false)
+}
+
+func updateDescription(name, etag string, desc *Description, preserveSecrets bool) error {
+	if !validHallName(name) {
+		return UserError("illegal hall name")
+	}
 	halls.mu.Lock()
 	defer halls.mu.Unlock()
 
@@ -381,7 +406,7 @@ func UpdateDescription(name, etag string, desc *Description) error {
 	}
 
 	newdesc := *desc
-	if old != nil {
+	if old != nil && preserveSecrets {
 		newdesc.Users = old.Users
 		newdesc.WildcardUser = old.WildcardUser
 		newdesc.AuthKeys = old.AuthKeys
@@ -395,7 +420,7 @@ func rewriteDescriptionFile(filename string, desc *Description) error {
 	if err != nil {
 		return err
 	}
-	if !conf.WritableHalls {
+	if !conf.WritableHalls && !localAdministration {
 		return ErrDescriptionsNotWritable
 	}
 
@@ -657,9 +682,15 @@ func GetUserTag(hall, username string, wildcard bool) (string, error) {
 }
 
 func DeleteUser(hall, username string, wildcard bool, etag string) error {
+	if !validHallName(hall) {
+		return UserError("illegal hall name")
+	}
 	if wildcard && username != "" {
 		return errors.New("wildcard with username")
 	}
+	if !wildcard && !validUsername(username) {
+		return UserError("illegal username")
+	}
 
 	halls.mu.Lock()
 	defer halls.mu.Unlock()
@@ -698,9 +729,15 @@ func DeleteUser(hall, username string, wildcard bool, etag string) error {
 }
 
 func UpdateUser(hall, username string, wildcard bool, etag string, user *UserDescription) error {
+	if !validHallName(hall) {
+		return UserError("illegal hall name")
+	}
 	if wildcard && username != "" {
 		return errors.New("wildcard with username")
 	}
+	if !wildcard && !validUsername(username) {
+		return UserError("illegal username")
+	}
 	if user.Password.Type != "" || user.Password.Key != nil {
 		return errors.New("user description is not sanitised")
 	}
@@ -750,9 +787,15 @@ func UpdateUser(hall, username string, wildcard bool, etag string, user *UserDes
 }
 
 func SetUserPassword(hall, username string, wildcard bool, pw Password) error {
+	if !validHallName(hall) {
+		return UserError("illegal hall name")
+	}
 	if wildcard && username != "" {
 		return errors.New("wildcard with username")
 	}
+	if !wildcard && !validUsername(username) {
+		return UserError("illegal username")
+	}
 
 	halls.mu.Lock()
 	defer halls.mu.Unlock()