Proof of concept for sending profile data

Signed-off-by: Miquel Sabaté Solà <msabate@suse.com>

Author: mssola

cmd/public-api-demo/main.go

@@ -77,7 +77,7 @@ func runDemo(identifier, version, arch, regcode string) error {
 
 		connection.AddRegcodeAuth(request, regcode)
 
-		payload, err := conn.Do(request)
+		_, payload, err := conn.Do(request)
 		if err != nil {
 			return err
 		}
@@ -109,7 +109,9 @@ func runDemo(identifier, version, arch, regcode string) error {
 		"instance_data": "<document>{}</document>",
 	}
 
-	status, statusErr := registration.Status(conn, hostname, systemInformation, extraData)
+	profiles := registration.DataProfiles{}
+
+	status, statusErr := registration.Status(conn, hostname, systemInformation, profiles, extraData)
 	if statusErr != nil {
 		return statusErr
 	}

internal/connect/client.go

@@ -337,7 +337,7 @@ func IsOutdatedRegProxy(conn connection.Connection, opts *Options) bool {
 		return true
 	}
 
-	_, err = conn.Do(req)
+	_, _, err = conn.Do(req)
 	if err == nil {
 		return true
 	}
@@ -418,7 +418,7 @@ func InstallerUpdates(conn connection.Connection, product registration.Product)
 	}
 	req = connection.AddQuery(req, product.ToQuery())
 
-	resp, err := conn.Do(req)
+	_, resp, err := conn.Do(req)
 	if err != nil {
 		return repos, err
 	}
@@ -451,7 +451,7 @@ func SyncProducts(conn connection.Connection, products []registration.Product) (
 
 	connection.AddSystemAuth(request, login, password)
 
-	response, doErr := conn.Do(request)
+	_, response, doErr := conn.Do(request)
 	if doErr != nil {
 		return remoteProducts, doErr
 	}
@@ -500,7 +500,7 @@ func updateMigrations(conn connection.Connection, url string, payload any) ([]Mi
 
 	connection.AddSystemAuth(request, login, password)
 
-	response, doErr := conn.Do(request)
+	_, response, doErr := conn.Do(request)
 	if doErr != nil {
 		return migrations, doErr
 	}

internal/connect/wrapper.go

@@ -1,6 +1,8 @@
 package connect
 
 import (
+	"crypto/sha256"
+	"encoding/hex"
 	"fmt"
 	"net/http"
 	"net/url"
@@ -102,6 +104,33 @@ func NewWrappedAPI(opts *Options) WrappedAPI {
 	}
 }
 
+// TODO: NOTE: just for testing purposes. It's a quick and dirty implementation
+// of a packages list collection. No caching, no fancy business :-)
+func FetchSystemProfiles() (registration.DataProfiles, error) {
+	output, err := util.Execute([]string{"rpm", "-qa"}, nil)
+	if err != nil {
+		return registration.DataProfiles{}, err
+	}
+
+	hash := sha256.Sum256(output)
+	digest := hex.EncodeToString(hash[:])
+
+	data := ""
+	if os.Getenv("CONNECT_PROFILE_FULL") == "1" {
+		data = string(output)
+	}
+
+	packages := map[string]string{
+		"digest": digest,
+		"data":   data,
+	}
+	result := registration.DataProfiles{
+		"packages": packages,
+	}
+
+	return result, nil
+}
+
 // Submit a keepalive request to the server pointed by the configured
 // connection.
 func (w Wrapper) KeepAlive(uptimeTracking bool) error {
@@ -122,8 +151,15 @@ func (w Wrapper) KeepAlive(uptimeTracking bool) error {
 		extraData["online_at"] = data
 	}
 
-	code, err := registration.Status(w.Connection, hostname, hwinfo, extraData)
-	if code != registration.Registered {
+	profiles, err := FetchSystemProfiles()
+	if err != nil {
+		return fmt.Errorf("could not fetch system's profiles: %v", err)
+	}
+
+	code, err := registration.Status(w.Connection, hostname, hwinfo, profiles, extraData)
+	if code == registration.ClearCache {
+		fmt.Printf("CACHE SHOULD BE CLEARED!\n")
+	} else if code != registration.Registered {
 		return fmt.Errorf("trying to send a keepalive from a system not yet registered. Register this system first")
 	}
 	return err

pkg/connection/connection.go

@@ -24,9 +24,9 @@ type Connection interface {
 	// Builds a http.Request and setup up headers. The body can provided as io.Reader
 	BuildRequestRaw(verb string, path string, body io.Reader) (*http.Request, error)
 
-	// Performs an HTTP request to the remote API. Returns the response body or
-	// an error object.
-	Do(*http.Request) ([]byte, error)
+	// Performs an HTTP request to the remote API. Returns the status code and
+	// the response body, or an error object.
+	Do(*http.Request) (int, []byte, error)
 
 	// Returns the credentials object to be used for authenticated requests.
 	GetCredentials() Credentials
@@ -77,35 +77,35 @@ func (conn ApiConnection) BuildRequestRaw(verb string, path string, body io.Read
 	return request, nil
 }
 
-func (conn ApiConnection) Do(request *http.Request) ([]byte, error) {
+func (conn ApiConnection) Do(request *http.Request) (int, []byte, error) {
 	token, tokenErr := conn.Credentials.Token()
 	if tokenErr != nil {
-		return []byte{}, tokenErr
+		return 0, []byte{}, tokenErr
 	}
 	request.Header.Set("System-Token", token)
 
 	response, doErr := conn.setupHTTPClient().Do(request)
 	if doErr != nil {
-		return nil, doErr
+		return 0, nil, doErr
 	}
 	defer response.Body.Close()
 
 	// Update the credentials from the new system token.
 	token = response.Header.Get("System-Token")
 	if err := conn.Credentials.UpdateToken(token); err != nil {
-		return nil, err
+		return 0, nil, err
 	}
 
 	// Check if there was an error from the given API response.
 	if apiError := ErrorFromResponse(response); apiError != nil {
-		return nil, apiError
+		return 0, nil, apiError
 	}
 
 	data, readErr := io.ReadAll(response.Body)
 	if readErr != nil {
-		return nil, readErr
+		return 0, nil, readErr
 	}
-	return data, nil
+	return response.StatusCode, data, nil
 }
 
 func (conn ApiConnection) GetCredentials() Credentials {

pkg/labels/assign.go

@@ -31,7 +31,7 @@ func AssignLabels(conn connection.Connection, labels []Label) ([]Label, error) {
 
 	connection.AddSystemAuth(request, login, password)
 
-	response, doErr := conn.Do(request)
+	_, response, doErr := conn.Do(request)
 	if doErr != nil {
 		return []Label{}, doErr
 	}

pkg/labels/list.go

@@ -22,7 +22,7 @@ func ListLabels(conn connection.Connection) ([]Label, error) {
 
 	connection.AddSystemAuth(request, login, password)
 
-	response, doErr := conn.Do(request)
+	_, response, doErr := conn.Do(request)
 	if doErr != nil {
 		return []Label{}, doErr
 	}

pkg/labels/unassign.go

@@ -27,7 +27,7 @@ func UnassignLabel(conn connection.Connection, labelId int) ([]Label, error) {
 
 	connection.AddSystemAuth(request, login, password)
 
-	response, doErr := conn.Do(request)
+	_, response, doErr := conn.Do(request)
 	if doErr != nil {
 		return []Label{}, doErr
 	}

pkg/registration/activate.go

@@ -85,7 +85,7 @@ func doActivateCall(conn connection.Connection, verb, identifier, version, arch,
 
 	connection.AddSystemAuth(request, login, password)
 
-	response, doErr := conn.Do(request)
+	_, response, doErr := conn.Do(request)
 	if doErr != nil {
 		return nil, &Product{}, doErr
 	}

pkg/registration/activation.go

@@ -52,7 +52,7 @@ func FetchActivations(conn connection.Connection) ([]*Activation, error) {
 
 	connection.AddSystemAuth(request, login, password)
 
-	response, doErr := conn.Do(request)
+	_, response, doErr := conn.Do(request)
 	if doErr != nil {
 		return []*Activation{}, doErr
 	}

pkg/registration/offline_request.go

@@ -86,7 +86,7 @@ func RegisterWithOfflineRequest(conn connection.Connection, regcode string, offl
 	// the API is not parsing the request blob as compressed JSON
 	request.Header.Set("Content-Type", "text/plain")
 
-	response, doErr := conn.Do(request)
+	_, response, doErr := conn.Do(request)
 	if doErr != nil {
 		return nil, doErr
 	}