feat: Implement role-based registration restrictions and reorganize Bruno collection
- Add role-based restrictions to POST /api/auth/register endpoint - Only admins can create admin accounts if any admin already exists - First user automatically gets admin role regardless of request - Regular users can only create user accounts, not admin accounts - Unauthenticated users can only create first admin, not subsequent admins - Reorganize Bruno collection into logical subfolders (auth/, admin/, profile/) - Update documentation to reflect new registration restrictions and security rules BREAKING CHANGES: - /api/auth/register now enforces role-based creation restrictions - Bruno collection reorganized with subfolder structure
This commit is contained in:
@@ -1,68 +0,0 @@
|
|||||||
meta {
|
|
||||||
name: Register Admin User
|
|
||||||
type: http
|
|
||||||
seq: 4
|
|
||||||
}
|
|
||||||
|
|
||||||
post {
|
|
||||||
url: {{base_url}}/api/auth/register
|
|
||||||
body: json
|
|
||||||
auth: inherit
|
|
||||||
}
|
|
||||||
|
|
||||||
body:json {
|
|
||||||
{
|
|
||||||
"email": "admin@example.com",
|
|
||||||
"username": "admin",
|
|
||||||
"password": "admin123",
|
|
||||||
"first_name": "Admin",
|
|
||||||
"last_name": "User",
|
|
||||||
"role": "admin"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
script:post-response {
|
|
||||||
function onResponse(res) {
|
|
||||||
let data = res.getBody();
|
|
||||||
return bru.setEnvVar("token", data.token, { persist: true });
|
|
||||||
}
|
|
||||||
onResponse(res);
|
|
||||||
}
|
|
||||||
|
|
||||||
settings {
|
|
||||||
encodeUrl: true
|
|
||||||
timeout: 0
|
|
||||||
}
|
|
||||||
|
|
||||||
docs {
|
|
||||||
## Register Admin User
|
|
||||||
|
|
||||||
Creates a new admin user account.
|
|
||||||
|
|
||||||
**Method:** POST
|
|
||||||
|
|
||||||
**Endpoint:** /api/auth/register
|
|
||||||
|
|
||||||
**Request Body:**
|
|
||||||
- `email` (string): Email address
|
|
||||||
- `username` (string): Username
|
|
||||||
- `password` (string): Password
|
|
||||||
- `first_name` (string, optional): First name
|
|
||||||
- `last_name` (string, optional): Last name
|
|
||||||
- `role` (string): Must be "admin"
|
|
||||||
|
|
||||||
**Response:**
|
|
||||||
- `token` (string): JWT token with admin role
|
|
||||||
- `user` (object): User details
|
|
||||||
- `id` (string): User ID
|
|
||||||
- `email` (string): Email
|
|
||||||
- `username` (string): Username
|
|
||||||
- `theme` (string): User theme preference
|
|
||||||
- `first_name` (string, optional): First name
|
|
||||||
- `last_name` (string, optional): Last name
|
|
||||||
- `role` (string): User role ("admin")
|
|
||||||
|
|
||||||
**Status Codes:**
|
|
||||||
- 201: Created
|
|
||||||
- 409: User exists
|
|
||||||
}
|
|
||||||
@@ -1,67 +0,0 @@
|
|||||||
meta {
|
|
||||||
name: Register User
|
|
||||||
type: http
|
|
||||||
seq: 3
|
|
||||||
}
|
|
||||||
|
|
||||||
post {
|
|
||||||
url: {{base_url}}/api/auth/register
|
|
||||||
body: json
|
|
||||||
auth: inherit
|
|
||||||
}
|
|
||||||
|
|
||||||
body:json {
|
|
||||||
{
|
|
||||||
"email": "test@example.com",
|
|
||||||
"username": "testuser",
|
|
||||||
"password": "password123",
|
|
||||||
"first_name": "Test",
|
|
||||||
"last_name": "User"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
script:post-response {
|
|
||||||
function onResponse(res) {
|
|
||||||
let data = res.getBody();
|
|
||||||
return bru.setEnvVar("token", data.token, { persist: true });
|
|
||||||
}
|
|
||||||
onResponse(res);
|
|
||||||
}
|
|
||||||
|
|
||||||
settings {
|
|
||||||
encodeUrl: true
|
|
||||||
timeout: 0
|
|
||||||
}
|
|
||||||
|
|
||||||
docs {
|
|
||||||
## Register User
|
|
||||||
|
|
||||||
Creates a new user account.
|
|
||||||
|
|
||||||
**Method:** POST
|
|
||||||
|
|
||||||
**Endpoint:** /api/auth/register
|
|
||||||
|
|
||||||
**Request Body:**
|
|
||||||
- `email` (string): Email address
|
|
||||||
- `username` (string): Username
|
|
||||||
- `password` (string): Password
|
|
||||||
- `first_name` (string, optional): First name
|
|
||||||
- `last_name` (string, optional): Last name
|
|
||||||
- `role` (string): User role ("user" or "admin")
|
|
||||||
|
|
||||||
**Response:**
|
|
||||||
- `token` (string): JWT token
|
|
||||||
- `user` (object): User details
|
|
||||||
- `id` (string): User ID
|
|
||||||
- `email` (string): Email
|
|
||||||
- `username` (string): Username
|
|
||||||
- `theme` (string): User theme preference
|
|
||||||
- `first_name` (string, optional): First name
|
|
||||||
- `last_name` (string, optional): Last name
|
|
||||||
- `role` (string): User role ("user" or "admin")
|
|
||||||
|
|
||||||
**Status Codes:**
|
|
||||||
- 201: Created
|
|
||||||
- 409: User exists
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,81 @@
|
|||||||
|
meta {
|
||||||
|
name: Register Admin User
|
||||||
|
type: http
|
||||||
|
seq: 4
|
||||||
|
}
|
||||||
|
|
||||||
|
post {
|
||||||
|
url: {{base_url}}/api/auth/register
|
||||||
|
body: json
|
||||||
|
auth: inherit
|
||||||
|
}
|
||||||
|
|
||||||
|
body:json {
|
||||||
|
{
|
||||||
|
"email": "admin@example.com",
|
||||||
|
"username": "admin",
|
||||||
|
"password": "admin123",
|
||||||
|
"first_name": "Admin",
|
||||||
|
"last_name": "User",
|
||||||
|
"role": "admin"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
script:post-response {
|
||||||
|
function onResponse(res) {
|
||||||
|
let data = res.getBody();
|
||||||
|
return bru.setEnvVar("token", data.token, { persist: true });
|
||||||
|
}
|
||||||
|
onResponse(res);
|
||||||
|
}
|
||||||
|
|
||||||
|
settings {
|
||||||
|
encodeUrl: true
|
||||||
|
timeout: 0
|
||||||
|
}
|
||||||
|
|
||||||
|
docs {
|
||||||
|
## Register Admin User
|
||||||
|
|
||||||
|
Creates a new admin user account with role-based restrictions.
|
||||||
|
|
||||||
|
**Method:** POST
|
||||||
|
|
||||||
|
**Endpoint:** /api/auth/register
|
||||||
|
|
||||||
|
**Request Body:**
|
||||||
|
- `email` (string): Email address
|
||||||
|
- `username` (string): Username
|
||||||
|
- `password` (string): Password
|
||||||
|
- `first_name` (string, optional): First name
|
||||||
|
- `last_name` (string, optional): Last name
|
||||||
|
- `role` (string): Must be "admin"
|
||||||
|
|
||||||
|
**Response:**
|
||||||
|
- `token` (string): JWT token with admin role
|
||||||
|
- `user` (object): User details
|
||||||
|
- `id` (string): User ID
|
||||||
|
- `email` (string): Email
|
||||||
|
- `username` (string): Username
|
||||||
|
- `theme` (string): User theme preference
|
||||||
|
- `first_name` (string, optional): First name
|
||||||
|
- `last_name` (string, optional): Last name
|
||||||
|
- `role` (string): User role ("admin")
|
||||||
|
|
||||||
|
**Status Codes:**
|
||||||
|
- 201: Created
|
||||||
|
- 400: Invalid input data
|
||||||
|
- 403: Forbidden - admin creation restrictions apply
|
||||||
|
- 409: User exists
|
||||||
|
|
||||||
|
**Role Restrictions:**
|
||||||
|
- **First User**: Anyone can create first admin (auto-assigned)
|
||||||
|
- **Existing Admins Present**: Only authenticated admins can create new admin accounts
|
||||||
|
- **Unauthenticated Users**: Cannot create admin accounts if any admin exists
|
||||||
|
- **Security**: Requires admin authentication for subsequent admin creation
|
||||||
|
|
||||||
|
**Usage Notes:**
|
||||||
|
- Use this request only when specifically creating admin accounts
|
||||||
|
- For regular user creation, use "Register User" request
|
||||||
|
- Admin token will have elevated privileges for administrative operations
|
||||||
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
meta {
|
meta {
|
||||||
name: Login User
|
name: Login User
|
||||||
type: http
|
type: http
|
||||||
seq: 2
|
seq: 1
|
||||||
}
|
}
|
||||||
|
|
||||||
post {
|
post {
|
||||||
@@ -0,0 +1,80 @@
|
|||||||
|
meta {
|
||||||
|
name: Register User
|
||||||
|
type: http
|
||||||
|
seq: 2
|
||||||
|
}
|
||||||
|
|
||||||
|
post {
|
||||||
|
url: {{base_url}}/api/auth/register
|
||||||
|
body: json
|
||||||
|
auth: inherit
|
||||||
|
}
|
||||||
|
|
||||||
|
body:json {
|
||||||
|
{
|
||||||
|
"email": "test@example.com",
|
||||||
|
"username": "testuser",
|
||||||
|
"password": "password123",
|
||||||
|
"first_name": "Test",
|
||||||
|
"last_name": "User"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
script:post-response {
|
||||||
|
function onResponse(res) {
|
||||||
|
let data = res.getBody();
|
||||||
|
return bru.setEnvVar("token", data.token, { persist: true });
|
||||||
|
}
|
||||||
|
onResponse(res);
|
||||||
|
}
|
||||||
|
|
||||||
|
settings {
|
||||||
|
encodeUrl: true
|
||||||
|
timeout: 0
|
||||||
|
}
|
||||||
|
|
||||||
|
docs {
|
||||||
|
## Register User
|
||||||
|
|
||||||
|
Creates a new user account with role-based restrictions.
|
||||||
|
|
||||||
|
**Method:** POST
|
||||||
|
|
||||||
|
**Endpoint:** /api/auth/register
|
||||||
|
|
||||||
|
**Request Body:**
|
||||||
|
- `email` (string): Email address
|
||||||
|
- `username` (string): Username
|
||||||
|
- `password` (string): Password
|
||||||
|
- `first_name` (string, optional): First name
|
||||||
|
- `last_name` (string, optional): Last name
|
||||||
|
- `role` (string): User role ("user" or "admin")
|
||||||
|
|
||||||
|
**Response:**
|
||||||
|
- `token` (string): JWT token
|
||||||
|
- `user` (object): User details
|
||||||
|
- `id` (string): User ID
|
||||||
|
- `email` (string): Email
|
||||||
|
- `username` (string): Username
|
||||||
|
- `theme` (string): User theme preference
|
||||||
|
- `first_name` (string, optional): First name
|
||||||
|
- `last_name` (string, optional): Last name
|
||||||
|
- `role` (string): User role ("user" or "admin")
|
||||||
|
|
||||||
|
**Status Codes:**
|
||||||
|
- 201: Created
|
||||||
|
- 400: Invalid input data
|
||||||
|
- 403: Forbidden - role-based restrictions apply
|
||||||
|
- 409: User exists
|
||||||
|
|
||||||
|
**Role Restrictions:**
|
||||||
|
- **First User**: Automatically gets admin role regardless of request
|
||||||
|
- **Existing Admins Present**: Only authenticated admins can create new admin accounts
|
||||||
|
- **No Admins Yet**: Anyone can create first admin (auto-assigned)
|
||||||
|
- **Regular User Creation**: Anyone can create regular user accounts
|
||||||
|
- **Unauthenticated Users**: Can only create first admin, not subsequent admins
|
||||||
|
|
||||||
|
**Examples:**
|
||||||
|
- First admin creation: `{"email": "admin@example.com", "username": "admin", "password": "password123", "role": "admin"}`
|
||||||
|
- Regular user creation: `{"email": "user@example.com", "username": "user", "password": "password123", "role": "user"}`
|
||||||
|
}
|
||||||
@@ -136,15 +136,25 @@ func (h *AuthHandler) Register(c echo.Context) error {
|
|||||||
return c.JSON(http.StatusInternalServerError, map[string]string{"error": "failed to hash password"})
|
return c.JSON(http.StatusInternalServerError, map[string]string{"error": "failed to hash password"})
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set role - first user is always admin, otherwise validate requested role
|
// Check if any admin users already exist
|
||||||
|
adminExists := false
|
||||||
|
for _, u := range users {
|
||||||
|
if u.Role == "admin" {
|
||||||
|
adminExists = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set role - first user is always admin, otherwise validate requested role based on existing admins
|
||||||
var userRole string
|
var userRole string
|
||||||
if len(users) == 0 {
|
if len(users) == 0 {
|
||||||
userRole = "admin" // First user is always admin
|
userRole = "admin" // First user is always admin
|
||||||
} else {
|
} else {
|
||||||
userRole = req.Role
|
userRole = req.Role
|
||||||
if userRole == "" {
|
if userRole == "" {
|
||||||
userRole = "user"
|
userRole = "user" // Default to regular user if not specified
|
||||||
}
|
}
|
||||||
|
|
||||||
// Validate role for subsequent users
|
// Validate role for subsequent users
|
||||||
if userRole != "user" && userRole != "admin" {
|
if userRole != "user" && userRole != "admin" {
|
||||||
if c.Request().Header.Get("HX-Request") == "true" {
|
if c.Request().Header.Get("HX-Request") == "true" {
|
||||||
@@ -152,6 +162,29 @@ func (h *AuthHandler) Register(c echo.Context) error {
|
|||||||
}
|
}
|
||||||
return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid role. must be 'user' or 'admin'"})
|
return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid role. must be 'user' or 'admin'"})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Role-based restrictions: only admins can create admin users if any admin already exists
|
||||||
|
if userRole == "admin" && adminExists {
|
||||||
|
// Check if current user is admin (requires authentication)
|
||||||
|
userID := c.Get("user_id")
|
||||||
|
if userID == nil {
|
||||||
|
// Not authenticated - cannot create admin user if admins exist
|
||||||
|
if c.Request().Header.Get("HX-Request") == "true" {
|
||||||
|
return c.HTML(http.StatusForbidden, `<div class="text-red-500">Only existing administrators can create admin accounts</div>`)
|
||||||
|
}
|
||||||
|
return c.JSON(http.StatusForbidden, map[string]string{"error": "only existing administrators can create admin accounts"})
|
||||||
|
}
|
||||||
|
|
||||||
|
// User is authenticated - check their role
|
||||||
|
userRoleAuth := c.Get("user_role").(string)
|
||||||
|
if userRoleAuth != "admin" {
|
||||||
|
// Authenticated but not admin - cannot create admin accounts
|
||||||
|
if c.Request().Header.Get("HX-Request") == "true" {
|
||||||
|
return c.HTML(http.StatusForbidden, `<div class="text-red-500">Only administrators can create admin accounts</div>`)
|
||||||
|
}
|
||||||
|
return c.JSON(http.StatusForbidden, map[string]string{"error": "only administrators can create admin accounts"})
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create user
|
// Create user
|
||||||
|
|||||||
Reference in New Issue
Block a user