rebuild old code

Author: marcely0

Diff for: api/dataservices/interface.go

@@ -49,6 +49,7 @@ type (
 		User() UserService
 		Version() VersionService
 		Webhook() WebhookService
+		Key() KeyService
 	}
 
 	// CustomTemplateService represents a service to manage custom templates
@@ -320,6 +321,11 @@ type (
 		DeleteWebhook(ID portainer.WebhookID) error
 		BucketName() string
 	}
+
+	KeyService interface {
+		Keys() ([]portainer.Key, error)
+		Create(keyObject *portainer.Key, data string)
+	}
 )
 
 func IsErrObjectNotFound(e error) bool {

Diff for: api/dataservices/key/key.go

@@ -0,0 +1,52 @@
+package key
+
+import (
+	portainer "github.com/portainer/portainer/api"
+)
+
+const (
+	BucketName = "keys"
+)
+
+type Service struct {
+	connection portainer.Connection
+}
+
+func (service *Service) BucketName() string {
+	return BucketName
+}
+
+// NewService creates a new instance of this conf. compute service.
+func NewService(connection portainer.Connection) (*Service, error) {
+	err := connection.SetServiceName(BucketName)
+	if err != nil {
+		return nil, err
+	}
+
+	return &Service{
+		connection: connection,
+	}, nil
+}
+
+func (service *Service) Create(keyObject *portainer.Key, data string) error {
+
+	//only generate if not set
+	// if keyObject.Key == nil {
+	// 	// generate new rsa key
+	// 	privatekey, err := GenerateMultiPrimeKeyForSGX(rand.Reader, 2, 3072)
+	// 	if err != nil {
+	// 		fmt.Fprintf(os.Stderr, "Cannot generate RSA key\n")
+	// 		return errors.New("Could not generate Key")
+	// 	}
+
+	// 	keyObject.Key = privatekey
+	// }
+
+	return service.connection.CreateObject(
+		BucketName,
+		func(id uint64) (int, interface{}) {
+			keyObject.ID = portainer.KeyID(id)
+			return int(id), keyObject
+		},
+	)
+}

Diff for: api/datastore/migrator/migrator.go

@@ -8,6 +8,7 @@ import (
 	"github.com/portainer/portainer/api/dataservices/endpointrelation"
 	"github.com/portainer/portainer/api/dataservices/extension"
 	"github.com/portainer/portainer/api/dataservices/fdoprofile"
+	"github.com/portainer/portainer/api/dataservices/key"
 	"github.com/portainer/portainer/api/dataservices/registry"
 	"github.com/portainer/portainer/api/dataservices/resourcecontrol"
 	"github.com/portainer/portainer/api/dataservices/role"
@@ -45,6 +46,7 @@ type (
 		fileService             portainer.FileService
 		authorizationService    *authorization.Service
 		dockerhubService        *dockerhub.Service
+		keyService              *key.Service
 	}
 
 	// MigratorParameters represents the required parameters to create a new Migrator instance.
@@ -69,6 +71,7 @@ type (
 		FileService             portainer.FileService
 		AuthorizationService    *authorization.Service
 		DockerhubService        *dockerhub.Service
+		KeyService              *key.Service
 	}
 )
 
@@ -95,6 +98,7 @@ func NewMigrator(parameters *MigratorParameters) *Migrator {
 		fileService:             parameters.FileService,
 		authorizationService:    parameters.AuthorizationService,
 		dockerhubService:        parameters.DockerhubService,
+		keyService:              parameters.KeyService,
 	}
 }
 

Diff for: api/datastore/services.go

@@ -21,6 +21,7 @@ import (
 	"github.com/portainer/portainer/api/dataservices/extension"
 	"github.com/portainer/portainer/api/dataservices/fdoprofile"
 	"github.com/portainer/portainer/api/dataservices/helmuserrepository"
+	"github.com/portainer/portainer/api/dataservices/key"
 	"github.com/portainer/portainer/api/dataservices/registry"
 	"github.com/portainer/portainer/api/dataservices/resourcecontrol"
 	"github.com/portainer/portainer/api/dataservices/role"
@@ -74,6 +75,7 @@ type Store struct {
 	UserService               *user.Service
 	VersionService            *version.Service
 	WebhookService            *webhook.Service
+	KeyService                *key.Service
 }
 
 func (store *Store) initServices() error {
@@ -245,6 +247,12 @@ func (store *Store) initServices() error {
 	}
 	store.ScheduleService = scheduleService
 
+	keyService, err := key.NewService(store.connection)
+	if err != nil {
+		return err
+	}
+	store.KeyService = keyService
+
 	return nil
 }
 

Diff for: api/http/handler/portainercc/handler.go

@@ -26,6 +26,7 @@ func NewHandler(bouncer *security.RequestBouncer, dataStore dataservices.DataSto
 	restrictedRouter := h.NewRoute().Subrouter()
 	restrictedRouter.Use(bouncer.RestrictedAccess)
 
+	restrictedRouter.Handle("/portainercc/keys", httperror.LoggerHandler(h.generateOrImport)).Methods(http.MethodGet)
 	restrictedRouter.Handle("/portainercc/keys", httperror.LoggerHandler(h.generateOrImport)).Methods(http.MethodPost)
 
 	return h

Diff for: api/http/handler/portainercc/key.go

@@ -2,9 +2,11 @@ package portainercc
 
 import (
 	"encoding/json"
+	"log"
 	"net/http"
 
 	httperror "github.com/portainer/libhttp/error"
+	"github.com/portainer/libhttp/response"
 	portainer "github.com/portainer/portainer/api"
 )
 
@@ -32,5 +34,29 @@ func (handler *Handler) generateOrImport(w http.ResponseWriter, r *http.Request)
 		return httperror.BadRequest("request body malefomred", err)
 	}
 
+	keyObject := &portainer.Key{
+		KeyType:            params.KeyType,
+		Description:        params.Description,
+		TeamAccessPolicies: params.TeamAccessPolicies,
+	}
+
+	handler.DataStore.Key().Create(keyObject, params.Data)
+
+	log.Print("AHA?")
+	log.Print(keyObject)
+	log.Printf("BODY: %s", params.Data)
+
+	log.Print(params.Data != "")
+
 	return httperror.BadRequest("invalid body content", nil)
 }
+
+func (handler *Handler) getKeys(w http.ResponseWriter, r *http.Request) *httperror.HandlerError {
+	keys, err := handler.DataStore.Key().Keys()
+
+	if err != nil {
+		return httperror.InternalServerError("couldn retrive keys from db", err)
+	}
+
+	return response.JSON(w, keys)
+}

Diff for: example_pf.key

@@ -0,0 +1 @@
+KB�,�\�8��d�!l�