Merge branch 'develop' into change_docker_repo

Author: fiftin

Taskfile.yml

@@ -91,14 +91,14 @@ tasks:
       - ../api/public/favicon.ico
     cmds:
       - >-
-        env VUE_APP_BUILD_TYPE={{ .APP_BUILD_TYPE }}
+        {{ if eq OS "windows" }}set VUE_APP_BUILD_TYPE={{ .APP_BUILD_TYPE }} && {{ else }}env VUE_APP_BUILD_TYPE={{ .APP_BUILD_TYPE }}{{ end }}
         npm run build
 
   build:be:
     desc: Build server binary
     cmds:
       - >-
-        env CGO_ENABLED=0 GOOS={{ .GOOS }} GOARCH={{ .GOARCH }}
+        {{ if eq OS "windows" }}set CGO_ENABLED=0 && GOOS={{ .GOOS }} && GOARCH={{ .GOARCH }} && {{ else }}env CGO_ENABLED=0 GOOS={{ .GOOS }} GOARCH={{ .GOARCH }}{{ end }}
         go build -o bin/semaphore{{ if eq OS "windows" }}.exe{{ end }}
         -tags "netgo"
         -ldflags "-s -w -X {{ .IMPORT }}/util.Ver={{ .VERSION }} -X {{ .IMPORT }}/util.Commit={{ .SHA }} -X {{ .IMPORT }}/util.Date={{ .DATE }}" ./cli

api/projects/tasks.go

@@ -54,7 +54,12 @@ func AddTask(w http.ResponseWriter, r *http.Request) {
 		helpers.WriteErrorStatus(w, "No active subscription available.", http.StatusForbidden)
 		return
 	} else if err != nil {
-		util.LogErrorF(err, log.Fields{"error": "Cannot write new event to database"})
+		log.WithFields(log.Fields{
+			"context":     "AddTask",
+			"project_id":  project.ID,
+			"template_id": taskObj.TemplateID,
+			"user_id":     user.ID,
+		}).WithError(err).Error("Cannot add task")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}

cli/cmd/root.go

@@ -2,25 +2,22 @@ package cmd
 
 import (
 	"fmt"
-	"log/syslog"
 	"net/http"
 	"net/url"
 	"os"
 	"strings"
 
-	"github.com/semaphoreui/semaphore/api/helpers"
-	"github.com/semaphoreui/semaphore/services/server"
-	lSyslog "github.com/sirupsen/logrus/hooks/syslog"
-
 	"github.com/gorilla/handlers"
 	"github.com/semaphoreui/semaphore/api"
+	"github.com/semaphoreui/semaphore/api/helpers"
 	"github.com/semaphoreui/semaphore/api/sockets"
 	"github.com/semaphoreui/semaphore/db"
 	"github.com/semaphoreui/semaphore/db/factory"
 	proFactory "github.com/semaphoreui/semaphore/pro/db/factory"
 	proServer "github.com/semaphoreui/semaphore/pro/services/server"
 	proTasks "github.com/semaphoreui/semaphore/pro/services/tasks"
 	"github.com/semaphoreui/semaphore/services/schedules"
+	"github.com/semaphoreui/semaphore/services/server"
 	"github.com/semaphoreui/semaphore/services/tasks"
 	"github.com/semaphoreui/semaphore/util"
 	log "github.com/sirupsen/logrus"
@@ -73,17 +70,6 @@ func Execute() {
 	}
 }
 
-func initSyslog(conf *util.SyslogConfig) {
-	if conf.Enabled {
-		hook, err := lSyslog.NewSyslogHook(conf.Network, conf.Address, syslog.LOG_DEBUG, conf.Tag)
-		if err == nil {
-			log.AddHook(hook)
-		} else {
-			log.WithError(err).Fatal("Failed to create syslog hook")
-		}
-	}
-}
-
 func runService() {
 	store := createStore("root")
 

cli/cmd/syslog.go

@@ -0,0 +1,23 @@
+//go:build !windows
+// +build !windows
+
+package cmd
+
+import (
+	"log/syslog"
+
+	"github.com/semaphoreui/semaphore/util"
+	log "github.com/sirupsen/logrus"
+	lSyslog "github.com/sirupsen/logrus/hooks/syslog"
+)
+
+func initSyslog(conf *util.SyslogConfig) {
+	if conf.Enabled {
+		hook, err := lSyslog.NewSyslogHook(conf.Network, conf.Address, syslog.LOG_DEBUG, conf.Tag)
+		if err == nil {
+			log.AddHook(hook)
+		} else {
+			log.WithError(err).Fatal("Failed to create syslog hook")
+		}
+	}
+}

cli/cmd/syslog_windows.go

@@ -0,0 +1,17 @@
+//go:build windows
+// +build windows
+
+package cmd
+
+import (
+	"github.com/semaphoreui/semaphore/util"
+	log "github.com/sirupsen/logrus"
+)
+
+// initSyslog is disabled on Windows because the standard syslog package is not supported.
+func initSyslog(conf *util.SyslogConfig) {
+	if conf != nil && conf.Enabled {
+		log.Warn("Syslog is not supported on Windows. The syslog log channel will be disabled.")
+	}
+	// no-op on Windows
+}

db/SecretStorage.go

@@ -5,6 +5,7 @@ type SecretStorageType string
 const (
 	SecretStorageTypeLocal SecretStorageType = "local"
 	SecretStorageTypeVault SecretStorageType = "vault"
+	SecretStorageTypeDvls  SecretStorageType = "dvls"
 )
 
 type SecretStorage struct {
@@ -15,5 +16,5 @@ type SecretStorage struct {
 	Params    MapStringAnyField `db:"params" json:"params"`
 	ReadOnly  bool              `db:"readonly" json:"readonly"`
 
-	VaultToken string `db:"-" json:"vault_token,omitempty" backup:"-"`
+	Secret string `db:"-" json:"secret,omitempty" backup:"-"`
 }

pro/pkg/features/features.go

@@ -2,7 +2,6 @@ package features
 
 import (
 	"github.com/semaphoreui/semaphore/db"
-	"github.com/semaphoreui/semaphore/pro_interfaces"
 )
 
 func GetFeatures(user *db.User, plan string) map[string]bool {

pro/services/server/access_key_serializer_dvls.go

@@ -0,0 +1,32 @@
+package server
+
+import (
+	"github.com/semaphoreui/semaphore/db"
+)
+
+type DvlsStorageTokenDeserializer interface {
+	DeserializeSecret(key *db.AccessKey) error
+}
+
+type DvlsAccessKeyDeserializer struct {
+}
+
+func NewDvlsAccessKeyDeserializer(
+	_ db.AccessKeyManager,
+	_ db.SecretStorageRepository,
+	_ VaultStorageTokenDeserializer,
+) *DvlsAccessKeyDeserializer {
+	return &DvlsAccessKeyDeserializer{}
+}
+
+func (d *DvlsAccessKeyDeserializer) DeleteSecret(key *db.AccessKey) error {
+	return nil
+}
+
+func (d *DvlsAccessKeyDeserializer) SerializeSecret(key *db.AccessKey) (err error) {
+	return
+}
+
+func (d *DvlsAccessKeyDeserializer) DeserializeSecret(key *db.AccessKey) (res string, err error) {
+	return
+}

pro/services/server/access_key_serializer_rdm.go

@@ -12,6 +12,11 @@ func NewSubscriptionService(userRepo db.UserManager, optionsRepo db.OptionsManag
 type SubscriptionServiceImpl struct {
 }
 
+func (s *SubscriptionServiceImpl) GetToken() (res pro_interfaces.SubscriptionToken, err error) {
+	err = db.ErrNotFound
+	return
+}
+
 func (s *SubscriptionServiceImpl) HasActiveSubscription() bool {
 	return false
 }