feat: Website Add Composer support (#9997)

Refs #6030

Author: zhengkunwang223

agent/app/api/v2/website.go

@@ -1121,3 +1121,23 @@ func (b *BaseApi) OperateCrossSiteAccess(c *gin.Context) {
 	}
 	helper.Success(c)
 }
+
+// @Tags Website
+// @Summary Exec Composer
+// @Accept json
+// @Param request body request.ExecComposerReq true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /websites/exec/composer [post]
+func (b *BaseApi) ExecComposer(c *gin.Context) {
+	var req request.ExecComposerReq
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+	if err := websiteService.ExecComposer(req); err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}

agent/app/dto/request/website.go

@@ -152,22 +152,22 @@ type WebsiteDomainDelete struct {
 }
 
 type WebsiteHTTPSOp struct {
-	WebsiteID       uint     `json:"websiteId" validate:"required"`
-	Enable          bool     `json:"enable"`
-	WebsiteSSLID    uint     `json:"websiteSSLId"`
-	Type            string   `json:"type"  validate:"oneof=existed auto manual"`
-	PrivateKey      string   `json:"privateKey"`
-	Certificate     string   `json:"certificate"`
-	PrivateKeyPath  string   `json:"privateKeyPath"`
-	CertificatePath string   `json:"certificatePath"`
-	ImportType      string   `json:"importType"`
-	HttpConfig      string   `json:"httpConfig"  validate:"oneof=HTTPSOnly HTTPAlso HTTPToHTTPS"`
-	SSLProtocol     []string `json:"SSLProtocol"`
-	Algorithm       string   `json:"algorithm"`
-	Hsts            bool     `json:"hsts"`
-	HstsIncludeSubDomains            bool     `json:"hstsIncludeSubDomains"`
-	HttpsPorts      []int    `json:"httpsPorts"`
-	Http3           bool     `json:"http3"`
+	WebsiteID             uint     `json:"websiteId" validate:"required"`
+	Enable                bool     `json:"enable"`
+	WebsiteSSLID          uint     `json:"websiteSSLId"`
+	Type                  string   `json:"type"  validate:"oneof=existed auto manual"`
+	PrivateKey            string   `json:"privateKey"`
+	Certificate           string   `json:"certificate"`
+	PrivateKeyPath        string   `json:"privateKeyPath"`
+	CertificatePath       string   `json:"certificatePath"`
+	ImportType            string   `json:"importType"`
+	HttpConfig            string   `json:"httpConfig"  validate:"oneof=HTTPSOnly HTTPAlso HTTPToHTTPS"`
+	SSLProtocol           []string `json:"SSLProtocol"`
+	Algorithm             string   `json:"algorithm"`
+	Hsts                  bool     `json:"hsts"`
+	HstsIncludeSubDomains bool     `json:"hstsIncludeSubDomains"`
+	HttpsPorts            []int    `json:"httpsPorts"`
+	Http3                 bool     `json:"http3"`
 }
 
 type WebsiteNginxUpdate struct {
@@ -299,3 +299,13 @@ type CrossSiteAccessOp struct {
 	WebsiteID uint   `json:"websiteID" validate:"required"`
 	Operation string `json:"operation" validate:"required,oneof=Enable Disable"`
 }
+
+type ExecComposerReq struct {
+	Command    string `json:"command" validate:"required"`
+	ExtCommand string `json:"extCommand"`
+	Mirror     string `json:"mirror" validate:"required"`
+	Dir        string `json:"dir" validate:"required"`
+	User       string `json:"user" validate:"required"`
+	WebsiteID  uint   `json:"websiteID" validate:"required"`
+	TaskID     string `json:"taskID" validate:"required"`
+}

agent/app/service/website.go

@@ -126,6 +126,8 @@ type IWebsiteService interface {
 	ChangeDatabase(req request.ChangeDatabase) error
 
 	OperateCrossSiteAccess(req request.CrossSiteAccessOp) error
+
+	ExecComposer(req request.ExecComposerReq) error
 }
 
 func NewIWebsiteService() IWebsiteService {
@@ -466,15 +468,15 @@ func (w WebsiteService) CreateWebsite(create request.WebsiteCreate) (err error)
 			website.Protocol = constant.ProtocolHTTPS
 			website.WebsiteSSLID = create.WebsiteSSLID
 			appSSLReq := request.WebsiteHTTPSOp{
-				WebsiteID:    website.ID,
-				Enable:       true,
-				WebsiteSSLID: websiteModel.ID,
-				Type:         "existed",
-				HttpConfig:   "HTTPToHTTPS",
-				SSLProtocol:  []string{"TLSv1.3", "TLSv1.2"},
-				Algorithm:    "ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:!aNULL:!eNULL:!EXPORT:!DSS:!DES:!RC4:!3DES:!MD5:!PSK:!KRB5:!SRP:!CAMELLIA:!SEED",
-				Hsts:         true,
-				HstsIncludeSubDomains:         true,
+				WebsiteID:             website.ID,
+				Enable:                true,
+				WebsiteSSLID:          websiteModel.ID,
+				Type:                  "existed",
+				HttpConfig:            "HTTPToHTTPS",
+				SSLProtocol:           []string{"TLSv1.3", "TLSv1.2"},
+				Algorithm:             "ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:!aNULL:!eNULL:!EXPORT:!DSS:!DES:!RC4:!3DES:!MD5:!PSK:!KRB5:!SRP:!CAMELLIA:!SEED",
+				Hsts:                  true,
+				HstsIncludeSubDomains: true,
 			}
 			if err = applySSL(website, *websiteModel, appSSLReq); err != nil {
 				return err
@@ -960,7 +962,6 @@ func (w WebsiteService) GetWebsiteHTTPS(websiteId uint) (response.WebsiteHTTPS,
 		if p.Name == "add_header" && len(p.Params) > 0 {
 			if p.Params[0] == "Strict-Transport-Security" {
 				res.Hsts = true
-				//增加HSTS下子域名检查逻辑
 				if len(p.Params) > 1 {
 					hstsValue := p.Params[1]
 					if strings.Contains(hstsValue, "includeSubDomains") {
@@ -3319,3 +3320,50 @@ func (w WebsiteService) OperateCrossSiteAccess(req request.CrossSiteAccessOp) er
 	}
 	return nil
 }
+
+func (w WebsiteService) ExecComposer(req request.ExecComposerReq) error {
+	website, err := websiteRepo.GetFirst(repo.WithByID(req.WebsiteID))
+	if err != nil {
+		return err
+	}
+	sitePath := GetSitePath(website, SiteDir)
+	if !strings.Contains(req.Dir, sitePath) {
+		return buserr.New("ErrWebsiteDir")
+	}
+	if !files.NewFileOp().Stat(path.Join(req.Dir, "composer.json")) {
+		return buserr.New("ErrComposerFileNotFound")
+	}
+	if task.CheckResourceTaskIsExecuting(task.TaskExec, req.Command, website.ID) {
+		return buserr.New("ErrInstallExtension")
+	}
+	runtime, err := runtimeRepo.GetFirst(context.Background(), repo.WithByID(website.RuntimeID))
+	if err != nil {
+		return err
+	}
+	var command string
+	if req.Command != "custom" {
+		command = fmt.Sprintf("%s %s", req.Command, req.ExtCommand)
+	} else {
+		command = req.ExtCommand
+	}
+	resourceName := fmt.Sprintf("composer %s", command)
+	composerTask, err := task.NewTaskWithOps(resourceName, task.TaskExec, req.Command, req.TaskID, website.ID)
+	if err != nil {
+		return err
+	}
+	cmdMgr := cmd.NewCommandMgr(cmd.WithTask(*composerTask), cmd.WithTimeout(20*time.Minute))
+	siteDir, _ := settingRepo.Get(settingRepo.WithByKey("WEBSITE_DIR"))
+	execDir := strings.ReplaceAll(req.Dir, siteDir.Value, "/www")
+	composerTask.AddSubTask("", func(t *task.Task) error {
+		cmdStr := fmt.Sprintf("docker exec -u %s %s sh -c 'composer config -g repo.packagist composer %s && composer %s --working-dir=%s'", req.User, runtime.ContainerName, req.Mirror, command, execDir)
+		err = cmdMgr.RunBashCf(cmdStr)
+		if err != nil {
+			return err
+		}
+		return nil
+	}, nil)
+	go func() {
+		_ = composerTask.Execute()
+	}()
+	return nil
+}

agent/app/task/task.go

@@ -67,6 +67,7 @@ const (
 	TaskPush      = "TaskPush"
 	TaskClean     = "TaskClean"
 	TaskHandle    = "TaskHandle"
+	TaskExec      = "TaskExec"
 )
 
 const (

agent/i18n/lang/en.yaml

@@ -123,6 +123,8 @@ ErrBuildDirNotFound: 'The build directory does not exist'
 ErrImageNotExist: 'The operating environment {{ .name }} image does not exist, please re-edit the operating environment'
 ErrProxyIsUsed: "Load balancing has been used by reverse proxy, cannot be deleted"
 ErrSSLValid: 'Certificate file is abnormal, please check the certificate status!'
+ErrWebsiteDir: "Please select a directory within the website directory."
+ErrComposerFileNotFound: "composer.json file does not exist"
 
 #ssl
 ErrSSLCannotDelete: 'The {{ .name }} certificate is being used by a website and cannot be deleted'
@@ -328,6 +330,7 @@ SubTask: 'Subtask'
 RuntimeExtension: 'Runtime Environment Extension'
 TaskIsExecuting: 'Task is running'
 CustomAppstore: 'Custom application warehouse'
+TaskExec: 'Execute'
 
 # task - ai
 OllamaModelPull: 'Pull Ollama model {{ .name }}'

agent/i18n/lang/ja.yaml

@@ -123,6 +123,8 @@ ErrBuildDirNotFound: 'ビルド ディレクトリが存在しません'
 ErrImageNotExist: 'オペレーティング環境 {{ .name }} イメージが存在しません。オペレーティング環境を再編集してください'
 ErrProxyIsUsed: "ロードバランシングはリバースプロキシによって使用されているため、削除できません"
 ErrSSLValid: '証明書ファイルが異常です、証明書の状態を確認してください！'
+ErrWebsiteDir: "ウェブサイトディレクトリ内のディレクトリを選択してください。"
+ErrComposerFileNotFound: "composer.json ファイルが存在しません"
 
 #ssl
 ErrSSLCannotDelete: '{{ .name }} 証明書は Web サイトで使用されているため、削除できません'
@@ -328,6 +330,7 @@ SubTask: 'サブタスク'
 RuntimeExtension: 'ランタイム環境拡張'
 TaskIsExecuting: 'タスクは実行中です'
 CustomAppstore: 'カスタム アプリケーション ウェアハウス'
+TaskExec: '実行'
 
 #task - ai
 OllamaModelPull: 'Ollama モデル {{ .name }} をプルします'

agent/i18n/lang/ko.yaml

@@ -123,6 +123,8 @@ ErrBuildDirNotFound: '빌드 디렉토리가 존재하지 않습니다'
 ErrImageNotExist: '운영 환경 {{ .name }} 이미지가 존재하지 않습니다. 운영 환경을 다시 편집하세요.'
 ErrProxyIsUsed: "로드 밸런싱이 역방향 프록시에 의해 사용되었으므로 삭제할 수 없습니다"
 ErrSSLValid: '인증서 파일에 문제가 있습니다. 인증서 상태를 확인하세요!'
+ErrWebsiteDir: "웹사이트 디렉토리 내의 디렉토리를 선택하세요."
+ErrComposerFileNotFound: "composer.json 파일이 존재하지 않습니다"
 
 #SSL인증
 ErrSSLCannotDelete: '{{ .name }} 인증서는 웹사이트에서 사용 중이므로 삭제할 수 없습니다.'
@@ -328,6 +330,7 @@ SubTask: '하위 작업'
 RuntimeExtension: '런타임 환경 확장'
 TaskIsExecuting: '작업이 실행 중입니다'
 CustomAppstore: '사용자 정의 애플리케이션 웨어하우스'
+TaskExec": '실행'
 
 # 작업 - ai
 OllamaModelPull: 'Ollama 모델 {{ .name }}을(를) 끌어오세요'

agent/i18n/lang/ms.yaml

@@ -122,6 +122,8 @@ ErrBuildDirNotFound: 'Direktori binaan tidak wujud'
 ErrImageNotExist: 'Imej persekitaran operasi {{ .name }} tidak wujud, sila edit semula persekitaran pengendalian'
 ErrProxyIsUsed: "Pengimbang beban telah digunakan oleh pengganti terbalik, tidak boleh dipadamkan"
 ErrSSLValid: 'Fail sijil bermasalah, sila periksa status sijil!'
+ErrWebsiteDir: "Sila pilih direktori dalam direktori laman web."
+ErrComposerFileNotFound: "Fail composer.json tidak wujud"
 
 #ssl
 ErrSSLCannotDelete: 'Sijil {{ .name }} sedang digunakan oleh tapak web dan tidak boleh dipadamkan'
@@ -327,6 +329,7 @@ SubTask: 'Subtugas'
 RuntimeExtension: 'Sambungan Persekitaran Runtime'
 TaskIsExecuting: 'Tugas sedang berjalan'
 CustomAppstore: 'Gudang aplikasi tersuai'
+TaskExec: 'Laksanakan'
 
 # tugasan - ai
 OllamaModelPull: 'Tarik model Ollama {{ .name }}'

agent/i18n/lang/pt-BR.yaml

@@ -123,6 +123,8 @@ ErrBuildDirNotFound: 'O diretório de compilação não existe'
 ErrImageNotExist: 'A imagem do ambiente operacional {{ .name }} não existe, edite novamente o ambiente operacional'
 ErrProxyIsUsed: "Balanceamento de carga foi usado por proxy reverso, não pode ser excluído"
 ErrSSLValid: 'O arquivo do certificado está anormal, verifique o status do certificado!'
+ErrWebsiteDir: "Por favor, selecione um diretório dentro do diretório do site."
+ErrComposerFileNotFound: "O arquivo composer.json não existe"
 
 #ssl
 ErrSSLCannotDelete: 'O certificado {{ .name }} está sendo usado por um site e não pode ser excluído'
@@ -328,6 +330,7 @@ SubTask: 'Subtarefa'
 RuntimeExtension: 'Extensão do ambiente de tempo de execução'
 TaskIsExecuting: 'A tarefa está em execução'
 CustomAppstore: 'Armazém de aplicativos personalizados'
+TaskExec: 'Executar'
 
 # tarefa - ai
 OllamaModelPull: 'Puxar modelo Ollama {{ .name }}'

agent/i18n/lang/ru.yaml

@@ -123,6 +123,8 @@ ErrBuildDirNotFound: 'Каталог сборки не существует'
 ErrImageNotExist: 'Образ операционной среды {{ .name }} не существует, пожалуйста, отредактируйте операционную среду заново'
 ErrProxyIsUsed: "Балансировка нагрузки используется обратным прокси, невозможно удалить"
 ErrSSLValid: 'Файл сертификата аномален, проверьте статус сертификата!'
+ErrWebsiteDir: "Пожалуйста, выберите директорию внутри директории сайта."
+ErrComposerFileNotFound: "Файл composer.json не существует"
 
 #ssl
 ErrSSLCannotDelete: 'Сертификат {{ .name }} используется веб-сайтом и не может быть удален'
@@ -328,6 +330,7 @@ SubTask: 'Подзадача'
 RuntimeExtension: 'Расширение среды выполнения'
 TaskIsExecuting: 'Задача выполняется'
 CustomAppstore: 'Хранилище пользовательских приложений'
+TaskExec: 'Выполнить'
 
 # задача - ай
 OllamaModelPull: 'Вытянуть модель Ollama {{ .name }}'