HMS-2694 feat: Host conf token MVP

internal/handler/impl/application.go

@@ -4,12 +4,16 @@ import (
 	"crypto/rand"
 	"crypto/sha256"
 	"encoding/base64"
+	"encoding/json"
 	"fmt"
 	"hash"
 	"io"
+	"time"
 
+	"github.com/lestrrat-go/jwx/v2/jwk"
 	"github.com/podengo-project/idmsvc-backend/internal/config"
 	"github.com/podengo-project/idmsvc-backend/internal/handler"
+	"github.com/podengo-project/idmsvc-backend/internal/infrastructure/token"
 	"github.com/podengo-project/idmsvc-backend/internal/interface/client"
 	"github.com/podengo-project/idmsvc-backend/internal/interface/interactor"
 	"github.com/podengo-project/idmsvc-backend/internal/interface/presenter"
@@ -42,6 +46,9 @@ type hostComponent struct {
 // Application secrets
 type appSecrets struct {
 	domainRegKey []byte
+	// TODO: store JWKs in database
+	signingKeys []jwk.Key
+	publicKeys  []string
 }
 
 type application struct {
@@ -120,6 +127,26 @@ func getAppSecret(config *config.Config) (sec *appSecrets, err error) {
 		return nil, err
 	}
 
+	// TODO: temporary hack
+	var (
+		priv jwk.Key
+		pub  jwk.Key
+		pubs []byte
+	)
+	expiration := time.Now().Add(90 * 24 * time.Hour)
+	if priv, err = token.GeneratePrivateJWK(expiration); err != nil {
+		return nil, err
+	}
+	sec.signingKeys = []jwk.Key{priv}
+
+	if pub, err = priv.PublicKey(); err != nil {
+		return nil, err
+	}
+	if pubs, err = json.Marshal(pub); err != nil {
+		return nil, err
+	}
+	sec.publicKeys = []string{string(pubs)}
+
 	return sec, nil
 
 }

internal/handler/impl/host_handler.go

@@ -23,6 +23,7 @@ func (a *application) HostConf(
 		domain  *model.Domain
 		output  *public.HostConfResponse
 		options *interactor.HostConfOptions
+		hctoken public.HostToken
 		tx      *gorm.DB
 		xrhid   *identity.XRHID
 	)
@@ -48,13 +49,20 @@ func (a *application) HostConf(
 	); err != nil {
 		return err
 	}
+	if hctoken, err = a.host.repository.SignHostConfToken(
+		a.secrets.signingKeys,
+		options,
+		domain,
+	); err != nil {
+		return err
+	}
 
 	if tx.Commit(); tx.Error != nil {
 		return tx.Error
 	}
 
 	if output, err = a.host.presenter.HostConf(
-		domain,
+		domain, hctoken,
 	); err != nil {
 		return err
 	}

internal/handler/impl/keys_handler.go

@@ -8,9 +8,9 @@ import (
 )
 
 func (a *application) GetSigningKeys(ctx echo.Context, params public.GetSigningKeysParams) error {
-	// TODO: Not Implemented
+	// TODO: hacky implementation
 	output := public.SigningKeysResponse{
-		Keys: []string{},
+		Keys: a.secrets.publicKeys,
 	}
 	return ctx.JSON(http.StatusOK, output)
 }

internal/infrastructure/token/jwk.go

@@ -7,6 +7,7 @@ import (
 	"crypto/rand"
 	"encoding/base64"
 	"fmt"
+	"math/big"
 	"time"
 
 	"github.com/lestrrat-go/jwx/v2/jwa"
@@ -15,14 +16,20 @@ import (
 
 const KeyCurve = jwa.P256
 
+// TODO: hard-coded ECDSA seed for testing
+const seed = "dummtestkey1234"
+
 // Generate a private key with additional properties
 // alg: based on key type (ES256 for P256)
 // exp: expiration time (Unix timestamp)
 // kid: base64 SHA-256 thumbprint
 // use: "sig"
-func GeneratePrivateJWK(expiration time.Time) (jwk.Key, error) {
-	var crv elliptic.Curve
-	var alg jwa.SignatureAlgorithm
+func GeneratePrivateJWK(expiration time.Time) (key jwk.Key, err error) {
+	var (
+		crv elliptic.Curve
+		alg jwa.SignatureAlgorithm
+		raw *ecdsa.PrivateKey
+	)
 
 	switch KeyCurve {
 	case jwa.P256:
@@ -32,12 +39,23 @@ func GeneratePrivateJWK(expiration time.Time) (jwk.Key, error) {
 		return nil, fmt.Errorf("Unsupported JWK curve %s", KeyCurve)
 	}
 
-	raw, err := ecdsa.GenerateKey(crv, rand.Reader)
-	if err != nil {
-		return nil, err
+	if len(seed) != 0 {
+		raw = &ecdsa.PrivateKey{}
+		raw.D = &big.Int{}
+		_, ok := raw.D.SetString(seed, 36)
+		if !ok {
+			panic("seed")
+		}
+		raw.PublicKey.Curve = crv
+		raw.PublicKey.X, raw.PublicKey.Y = crv.ScalarBaseMult(raw.D.Bytes())
+	} else {
+		raw, err = ecdsa.GenerateKey(crv, rand.Reader)
+		if err != nil {
+			return nil, err
+		}
 	}
 
-	key, err := jwk.FromRaw(raw)
+	key, err = jwk.FromRaw(raw)
 	if err != nil {
 		return nil, err
 	}

internal/interface/interactor/host_interactor.go

@@ -2,15 +2,16 @@ package interactor
 
 import (
 	"github.com/google/uuid"
+	"github.com/podengo-project/idmsvc-backend/internal/api/public"
 	api_public "github.com/podengo-project/idmsvc-backend/internal/api/public"
 	"github.com/redhatinsights/platform-go-middlewares/identity"
 )
 
 type HostConfOptions struct {
 	OrgId       string
-	CommonName  string
-	InventoryId uuid.UUID
-	Fqdn        string
+	CommonName  public.SubscriptionManagerId
+	InventoryId public.HostId
+	Fqdn        public.Fqdn
 	DomainId    *uuid.UUID
 	DomainName  *string
 	DomainType  *api_public.DomainType

internal/interface/presenter/host_presenter.go

@@ -6,5 +6,5 @@ import (
 )
 
 type HostPresenter interface {
-	HostConf(domain *model.Domain) (*public.HostConfResponse, error)
+	HostConf(domain *model.Domain, token public.HostToken) (*public.HostConfResponse, error)
 }

internal/interface/repository/host_repository.go

@@ -1,6 +1,8 @@
 package repository
 
 import (
+	"github.com/lestrrat-go/jwx/v2/jwk"
+	"github.com/podengo-project/idmsvc-backend/internal/api/public"
 	"github.com/podengo-project/idmsvc-backend/internal/domain/model"
 	"github.com/podengo-project/idmsvc-backend/internal/interface/interactor"
 	"gorm.io/gorm"
@@ -9,4 +11,6 @@ import (
 // HostRepository interface
 type HostRepository interface {
 	MatchDomain(db *gorm.DB, options *interactor.HostConfOptions) (output *model.Domain, err error)
+	// TODO: hack, actual implementation will take gorm.DB argument
+	SignHostConfToken(privs []jwk.Key, options *interactor.HostConfOptions, domain *model.Domain) (hctoken public.HostToken, err error)
 }

internal/test/variables.go

@@ -27,6 +27,7 @@ const (
 )
 
 var (
+	DomainType   = public.RhelIdm
 	DomainUUID   = uuid.MustParse(DomainId)
 	RealmDomains = []string{DomainName, "otherdomain.test"}
 	Location1    = public.Location{
@@ -225,6 +226,7 @@ func BuildDomainModel(orgID string) *model.Domain {
 }
 
 var (
-	SystemXRHID = GetSystemXRHID(OrgId, Server1.CertCN, SystemAccountNr)
-	UserXRHID   = GetUserXRHID(OrgId, UserName, UserId, UserAccountNr, false)
+	SystemXRHID  = GetSystemXRHID(OrgId, Server1.CertCN, SystemAccountNr)
+	Client1XRHID = GetSystemXRHID(OrgId, Client1.CertCN, SystemAccountNr)
+	UserXRHID    = GetUserXRHID(OrgId, UserName, UserId, UserAccountNr, false)
 )

internal/usecase/interactor/host_interactor.go

@@ -3,6 +3,7 @@ package interactor
 import (
 	"fmt"
 
+	"github.com/google/uuid"
 	api_public "github.com/podengo-project/idmsvc-backend/internal/api/public"
 	internal_errors "github.com/podengo-project/idmsvc-backend/internal/errors"
 	"github.com/podengo-project/idmsvc-backend/internal/interface/interactor"
@@ -15,7 +16,13 @@ func NewHostInteractor() interactor.HostInteractor {
 	return hostInteractor{}
 }
 
-func (i hostInteractor) HostConf(xrhid *identity.XRHID, inventoryId api_public.HostId, fqdn string, params *api_public.HostConfParams, body *api_public.HostConf) (*interactor.HostConfOptions, error) {
+func (i hostInteractor) HostConf(
+	xrhid *identity.XRHID,
+	inventoryId api_public.HostId,
+	fqdn api_public.Fqdn,
+	params *api_public.HostConfParams,
+	body *api_public.HostConf,
+) (*interactor.HostConfOptions, error) {
 	if xrhid == nil {
 		return nil, internal_errors.NilArgError("xrhid")
 	}
@@ -31,10 +38,14 @@ func (i hostInteractor) HostConf(xrhid *identity.XRHID, inventoryId api_public.H
 	if body == nil {
 		return nil, internal_errors.NilArgError("body")
 	}
+	cn, err := uuid.Parse(xrhid.Identity.System.CommonName)
+	if err != nil {
+		return nil, err
+	}
 
 	options := &interactor.HostConfOptions{
 		OrgId:       xrhid.Identity.OrgID,
-		CommonName:  xrhid.Identity.System.CommonName,
+		CommonName:  cn,
 		InventoryId: inventoryId,
 		Fqdn:        fqdn,
 		DomainId:    body.DomainId,