feature: Logger log id support

Author: dogukanoksuz

app/middleware/app_logger/new.go

@@ -17,12 +17,14 @@ func New() fiber.Handler {
 			user_id = c.Locals("user_id").(string)
 		}
 
+		c.Locals("log_id", uuid.NewString())
+
 		logger.Sugar().WithOptions(
 			zap.WithCaller(false),
 		).Infow(
 			"render engine request",
 			"lmn_level", "request",
-			"log_id", uuid.NewString(),
+			"log_id", c.Locals("log_id").(string),
 			"user_id", user_id,
 			"route", c.Path(),
 			"ip_address", c.IP(),

app/models/php_command.go

@@ -9,4 +9,5 @@ type CommandParams struct {
 	Token          string
 	BaseURL        string
 	Locale         string
+	LogID          string
 }

internal/sandbox/command_generator.go

@@ -3,6 +3,7 @@ package sandbox
 import (
 	"fmt"
 	"io/ioutil"
+	"os"
 	"strings"
 
 	"github.com/alessio/shellescape"
@@ -33,6 +34,23 @@ func GenerateCommand(extension *models.Extension, credentials *models.Credential
 		return "", err
 	}
 
+	extJson, err := liman.GetExtensionJSON(extension)
+	if err != nil {
+		return "", err
+	}
+
+	requiredList := []string{}
+	if extJson["functions"] != nil {
+		for _, function := range extJson["functions"].([]interface{}) {
+			fn := function.(map[string]any)
+			requiredList = append(requiredList, fn["name"].(string))
+		}
+	}
+
+	if user.Status != 1 && !helpers.Contains(permissions, params.TargetFunction) && helpers.Contains(requiredList, params.TargetFunction) {
+		return "", logger.FiberError(fiber.StatusForbidden, "you have no permission to do this")
+	}
+
 	if credentials.Username != "" && credentials.Key != "" {
 		settings["clientUsername"] = credentials.Username
 		settings["clientPassword"] = credentials.Key
@@ -68,7 +86,7 @@ func GenerateCommand(extension *models.Extension, credentials *models.Credential
 		"license":         licenceData,
 		"token":           params.Token,
 		"locale":          params.Locale,
-		"log_id":          "0000000", // TODO: add log handlers
+		"log_id":          params.LogID,
 		"ajax":            "true",
 		"apiRoute":        "/extensionRun",
 	}
@@ -81,22 +99,22 @@ func GenerateCommand(extension *models.Extension, credentials *models.Credential
 	extensionDataJson, _ := sonic.Marshal(extensionData)
 	encryptedData := aes256.Encrypt(string(extensionDataJson), string(secureKey))
 
-	// TODO: extJsonfile
-	// TODO: required param tester
-	// TODO: targetFunction and permission match check
-	// TODO: so file handler
+	soPath := "/liman/extensions/" + strings.ToLower(extension.Name) + "/liman.so"
+	soCommand := ""
+	if _, err := os.Stat(soPath); err == nil {
+		soCommand = "-dextension=" + shellescape.Quote(soPath) + " "
+	}
 
 	command := fmt.Sprintf(
-		"runuser %s -c 'timeout %s /usr/bin/php -d display_errors=on %s %s %s'",
+		"runuser %s -c 'timeout %s /usr/bin/php %s -d display_errors=on %s %s %s'",
 		strings.Replace(extension.ID, "-", "", -1),
 		helpers.Env("EXTENSION_TIMEOUT", "30"),
+		soCommand,
 		constants.SANDBOX_PATH,
 		constants.KEYS_PATH+"/"+extension.ID,
 		encryptedData,
 	)
 
-	// TODO: complete the command generator
-
 	return command, nil
 }