Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[1.29] feat: Enable automatic cloud registration v2 again #3453

Draft
wants to merge 1 commit into
base: subscription-manager-1.29
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/rhsm/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -1519,11 +1519,10 @@ def getCloudJWT(self, cloud_id: str, metadata: str, signature: str) -> Dict[str,
}
headers = {
"Content-Type": "application/json",
"Accept": "text/plain",
}

return self.conn.request_post(
method="/cloud/authorize",
method="/cloud/authorize?version=2",
params=data,
headers=headers,
description=_("Fetching cloud token"),
Expand Down
35 changes: 25 additions & 10 deletions src/subscription_manager/scripts/rhsmcertd_worker.py
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ def _auto_register(cp_provider: "CPProvider") -> ExitStatus:

# Obtain automatic registration token
try:
token: Dict[str, str] = cache.CloudTokenCache._get_from_server(
token: Dict[str, str] = cache.CloudTokenCache.get(
uep=uep,
cloud_id=cloud_info["cloud_id"],
metadata=cloud_info["metadata"],
Expand All @@ -220,14 +220,29 @@ def _auto_register(cp_provider: "CPProvider") -> ExitStatus:
log.exception("Cloud token could not be obtained. Unable to perform automatic registration.")
return ExitStatus.NO_REGISTRATION_TOKEN

try:
_auto_register_standard(uep=uep, token=token)
except Exception:
log.exception("Standard automatic registration failed.")
return ExitStatus.REGISTRATION_FAILED
else:
log.info("Standard automatic registration was successful.")
return ExitStatus.OK
if token["tokenType"] == "CP-Cloud-Registration":
try:
_auto_register_standard(uep=uep, token=token)
except Exception:
log.exception("Standard automatic registration failed.")
return ExitStatus.REGISTRATION_FAILED
else:
log.info("Standard automatic registration was successful.")
return ExitStatus.OK

if token["tokenType"] == "CP-Anonymous-Cloud-Registration":
try:
_auto_register_anonymous(uep=uep, token=token)
cache.CloudTokenCache.delete_cache()
except Exception:
log.exception("Anonymous automatic registration failed.")
return ExitStatus.REGISTRATION_FAILED
else:
log.info("Anonymous automatic registration was successful.")
return ExitStatus.OK

log.error(f"Unsupported token type for automatic registration: {token['tokenType']}.")
return ExitStatus.BAD_TOKEN_TYPE


def _auto_register_standard(uep: "UEPConnection", token: Dict[str, str]) -> None:
Expand All @@ -242,7 +257,7 @@ def _auto_register_standard(uep: "UEPConnection", token: Dict[str, str]) -> None
_auto_register_wait()

service = RegisterService(cp=uep)
service.register(org=None, jwt_token=token)
service.register(org=None, jwt_token=token["token"])


def _auto_register_anonymous(uep: "UEPConnection", token: Dict[str, str]) -> None:
Expand Down
Loading