Merge remote-tracking branch 'origin/v0.11' into v0.11

Author: marle3003

.github/workflows/build.yml

@@ -10,12 +10,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
           go-version: 1.23.4
 
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup node
         uses: actions/setup-node@v4

.github/workflows/release.yml

@@ -12,7 +12,9 @@ jobs:
     env:
       DOCKER_CLI_EXPERIMENTAL: "enabled"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
@@ -52,7 +54,9 @@ jobs:
   release-windows:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - uses: actions/setup-go@v5
         with:
           go-version: 1.23.4

.goreleaser.windows.yml

@@ -4,6 +4,8 @@ builds:
   - env:
       - CGO_ENABLED=0
     ldflags:
+      - -s
+      - -w
       - -X mokapi/version.BuildVersion={{ .Version }}
       - -X mokapi/version.BuildTime={{ .Date }}
     main: ./cmd/mokapi
@@ -13,11 +15,11 @@ builds:
       - amd64
 archives:
   - name_template: '{{ .ProjectName }}_v{{ .Version }}_{{ .Os }}_{{ .Arch }}'
-    format: zip
+    formats: [ 'zip' ]
 checksum:
   name_template: "{{ .ProjectName }}_v{{ .Version }}_windows_checksums.txt"
 snapshot:
-  name_template: "{{ .Version }}"
+  version_template: "{{ .Version }}"
 
 chocolateys:
   - name: mokapi

.goreleaser.yml

@@ -4,6 +4,8 @@ builds:
   - env:
       - CGO_ENABLED=0
     ldflags:
+      - -s
+      - -w
       - -X mokapi/version.BuildVersion={{ .Version }}
       - -X mokapi/version.BuildTime={{ .Date }}
     main: ./cmd/mokapi

Taskfile.yml

@@ -10,7 +10,7 @@ tasks:
   build-windows:
     deps: [build-vue-app]
     cmds:
-      - go build -o mokapi-windows-amd64.exe -ldflags="-X 'mokapi/version.BuildVersion=1.0'" ./cmd/mokapi
+      - go build -o mokapi-windows-amd64.exe -ldflags="-w -s -X 'mokapi/version.BuildVersion=1.0'" ./cmd/mokapi
     env:
       GOOS: windows
       GOARCH: amd64

api/handler.go

@@ -207,6 +207,7 @@ func writeJsonBody(w http.ResponseWriter, i interface{}) {
 	b, err := json.Marshal(i)
 	if err != nil {
 		writeError(w, err, http.StatusInternalServerError)
+		return
 	}
 	_, err = w.Write(b)
 	if err != nil {

api/handler_http_test.go

@@ -292,7 +292,7 @@ func TestHandler_Http(t *testing.T) {
 				}
 			},
 			requestUrl:   "http://foo.api/api/services/http/foo",
-			responseBody: `{"name":"","paths":[{"path":"/foo/{bar}","operations":[{"method":"get","deprecated":false,"responses":[{"statusCode":"200","description":"foo description","contents":[{"type":"application/json","schema":{"type":"object","properties":{"loop":{"ref":"#/components/schemas/loop","type":"object","properties":{"loop":{"ref":"#/components/schemas/loop"}}}}}}]}]}]}]}`,
+			responseBody: `{"name":"","paths":[{"path":"/foo/{bar}","operations":[{"method":"get","deprecated":false,"responses":[{"statusCode":"200","description":"foo description","contents":[{"type":"application/json","schema":{"type":"object","properties":{"loop":{"$ref":"#/components/schemas/loop","type":"object","properties":{"loop":{"$ref":"#/components/schemas/loop"}}}}}}]}]}]}]}`,
 		},
 		{
 			name: "schema with default",

config/static/static_config.go

@@ -187,7 +187,11 @@ func (c *Config) Parse() error {
 		case "":
 			c.Providers.File.Filenames = append(c.Providers.File.Filenames, arg)
 		default:
-			return fmt.Errorf("positional argument is not supported: %v", arg)
+			if u.Opaque != "" {
+				c.Providers.File.Filenames = append(c.Providers.File.Filenames, arg)
+			} else {
+				return fmt.Errorf("positional argument is not supported: %v", arg)
+			}
 		}
 	}
 	return nil

config/static/static_config_test.go

@@ -512,7 +512,7 @@ providers:
 			},
 		},
 		{
-			name: "shorthand file",
+			name: "positional parameter file",
 			test: func(t *testing.T) {
 				os.Args = append(os.Args, "mokapi.exe", "foo.json")
 
@@ -527,7 +527,7 @@ providers:
 			},
 		},
 		{
-			name: "shorthand http",
+			name: "positional parameter http",
 			test: func(t *testing.T) {
 				os.Args = append(os.Args, "mokapi.exe", "http://foo.io/foo.json")
 
@@ -541,7 +541,7 @@ providers:
 			},
 		},
 		{
-			name: "shorthand https",
+			name: "positional parameter https",
 			test: func(t *testing.T) {
 				os.Args = append(os.Args, "mokapi.exe", "https://foo.io/foo.json")
 
@@ -555,7 +555,7 @@ providers:
 			},
 		},
 		{
-			name: "shorthand git with https",
+			name: "positional parameter git with https",
 			test: func(t *testing.T) {
 				os.Args = append(os.Args, "mokapi.exe", "git+https://foo.io/foo.json")
 
@@ -569,7 +569,7 @@ providers:
 			},
 		},
 		{
-			name: "shorthand npm",
+			name: "positional parameter npm",
 			test: func(t *testing.T) {
 				os.Args = append(os.Args, "mokapi.exe", "npm://bar/foo.txt?scope=@foo")
 
@@ -583,7 +583,7 @@ providers:
 			},
 		},
 		{
-			name: "shorthand not supported",
+			name: "positional parameter not supported",
 			test: func(t *testing.T) {
 				os.Args = append(os.Args, "mokapi.exe", "foo://bar")
 
@@ -594,6 +594,18 @@ providers:
 				require.EqualError(t, err, "positional argument is not supported: foo://bar")
 			},
 		},
+		{
+			name: "positional parameter Windows path",
+			test: func(t *testing.T) {
+				os.Args = append(os.Args, "mokapi.exe", "C:\\bar")
+
+				cfg := static.Config{}
+				err := decoders.Load([]decoders.ConfigDecoder{decoders.NewFlagDecoder()}, &cfg)
+				require.NoError(t, err)
+				err = cfg.Parse()
+				require.Equal(t, "C:\\bar", cfg.Providers.File.Filenames[0])
+			},
+		},
 	}
 
 	for _, tc := range testcases {

docs/examples/tutorials/mock-ldap-group-permission.md

@@ -8,15 +8,24 @@ icon: bi-shield-lock
 
 ## Introduction
 
-In this tutorial, you'll learn how to use Mokapi to mock an LDAP server for authentication and group-based access 
-control in a Node.js backend. This is useful for testing without relying on a real LDAP 
-server.
+LDAP authentication is widely used for managing user access in enterprise applications. However, setting up a real LDAP 
+server for testing can be complex and time-consuming. In this tutorial, you will learn how to use Mokapi to mock an 
+LDAP server and implement group-based authentication in a Node.js backend.
 
 ### What You'll Learn
 
-- Set up a mock LDAP server using Mokapi
-- Authenticate users via LDAP in a Node.js backend
-- Implement group-based permissions
+- ✅ Setting up a mock LDAP server with Mokapi
+- ✅ Authenticating users via LDAP in a Node.js backend
+- ✅ Implementing group-based permissions
+- ✅ Testing authentication using cURL
+
+## Prerequisites
+
+Before starting, ensure you have the following:
+
+- Node.js installed
+- Mokapi installed [Installation Guide](/docs/guides/get-started/installation.md)
+- Basic knowledge of LDAP authentication
 
 ## 1. Create an LDAP Mock Configuration
 
@@ -66,9 +75,15 @@ Using [LDAP Browser](https://marketplace.visualstudio.com/items?itemName=fengtan
 
 <img src="./vscode-ldap-browse-example.png" alt="Screenshot of VSCode displaying an LDAP directory structure." />
 
-## 2. Implementing Backend in Node.js
+## 2. Implement LDAP Authentication in Node.js
+
+Run the following command in install required dependencies:
+
+```shell
+npm install ldapjs express
+```
 
-Create a file `auth.js` and add:
+Create a file `auth.js` and add the following code:
 
 ```javascript
 const ldap = require('ldapjs');
@@ -101,6 +116,9 @@ function checkGroup(username, groupName, callback) {
 module.exports = { authenticate, checkGroup };
 ```
 
+- **authenticate**: This function binds the provided username and password to the mock LDAP server to verify authentication.
+- **checkGroup**: This function searches for the user to determine if they are a member of the Admins group.
+
 In 'server.js' we use the LDAP authentication and group-based access control:
 
 ```javascript tab=server.js
@@ -129,6 +147,8 @@ app.post('/login', (req, res) => {
 app.listen(PORT, () => console.log(`Server running on port ${PORT}`));
 ```
 
+This Express.js server handles authentication and ensures only users in the Admins group can access protected resources.
+
 ## 3. Testing the Mock LDAP Authentication 
 
 Start Mokapi LDAP server:
@@ -170,4 +190,6 @@ If the username and/or password is not correct, the response will be:
 ## Conclusion
 
 You’ve successfully mocked an LDAP server with Mokapi, authenticated users, and 
-implemented group-based permissions in a Node.js backend!
+implemented group-based permissions in a Node.js backend!
+
+This setup allows you to test LDAP authentication and group permissions without needing a real LDAP server.