Skip to content

Add revision command line argument #6

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.

Sign up for GitHub

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

Open
alexclewontin wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −3
Open

Add revision command line argument #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 9 additions & 3 deletions launchers/bin/msu.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,11 @@ def parseargs(argv=None):
parser.add_argument('-s', '--ssh-keys', nargs="+",
help=('Optionally add one or more public ssh keys to use for SSH using the system user to be created on the device. Either this or --password is required. Enclosed each key string in single quotes. Use a space to delimit them. For example: --ssh-keys \'key one\' \'key two\'.')
)
parser.add_argument('-r', '--revision',
default=1,
help=('Optionally specify the revison number of the system user assertion.'),
type=int
)
required.add_argument('-k', '--key', required=True,
help=('The name of the snapcraft key to use to sign the system user assertion. The key must exist locally and be reported by "snapcraft keys". The key must also be registered.')
)
Expand Down Expand Up @@ -210,7 +215,7 @@ def getUntil(argsuntil, dt, d, t):
until = d2 + 'T00:00:00-00:01'
return(until)

def systemUserJson(account, brand, model, username, since_days_ago, until, email):
def systemUserJson(account, brand, model, username, since_days_ago, until, email, revision):
data = dict()
data["type"] = "system-user"
data["authority-id"] = account
Expand All @@ -220,7 +225,7 @@ def systemUserJson(account, brand, model, username, since_days_ago, until, email
data["name"] = username + " User"
data["username"] = username
data["email"] = email
data["revision"] = "1"
data["revision"] = str(revision)

# We default to since of 2 days ago if not provided
since_delta = 2 if since_days_ago == None else since_days_ago
Expand Down Expand Up @@ -306,6 +311,7 @@ def main(argv=None):
print("Key: ", args.key)
print("Key Fingerprint: ", selfSignKey)
print("Since days ago: ", args.since_days_ago)
print("Revision: ", args.revision)
print("")

accountSigned = accountAssert(account['account_id'])
Expand All @@ -318,7 +324,7 @@ def main(argv=None):
print("==== Account Key signed:")
print(accountKeySigned)

userJson = systemUserJson(account['account_id'], args.brand, args.model, args.username, int(args.since_days_ago), args.until, args.email)
userJson = systemUserJson(account['account_id'], args.brand, args.model, args.username, int(args.since_days_ago), args.until, args.email, args.revision)
if args.password:
userJson["password"] = pword_hash(args.password)
if args.force_password_change:
Expand Down