From 0bc271116191ebf8cc4480861fe7b2cd1610b2ee Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Feb 13 2017 08:25:29 +0000 Subject: [PATCH 1/2] Add .pub suffix to deploykey filename Signed-off-by: Patrick Uiterwijk --- diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py index d2e4b86..662d9c2 100644 --- a/pagure/lib/__init__.py +++ b/pagure/lib/__init__.py @@ -245,7 +245,7 @@ def create_deploykeys_ssh_keys_on_disk(project, gitolite_keydir): for deploykey in project.deploykeys: # See the comment in lib/git.py:write_gitolite_acls about why this # name for a file is sane and does not inject a new security risk. - keyfile = 'deploykey_%s_%s' % ( + keyfile = 'deploykey_%s_%s.pub' % ( werkzeug.secure_filename(project.fullname), deploykey.id) if not os.path.exists(os.path.join(project_key_dir, keyfile)): From 94416d1cde204de0597f229e730e198b92c23650 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Feb 13 2017 08:29:02 +0000 Subject: [PATCH 2/2] Use makedirs Signed-off-by: Patrick Uiterwijk --- diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py index 662d9c2..4b7fb9f 100644 --- a/pagure/lib/__init__.py +++ b/pagure/lib/__init__.py @@ -235,7 +235,7 @@ def create_deploykeys_ssh_keys_on_disk(project, gitolite_keydir): project_key_dir = os.path.join(gitolite_keydir, 'deploykeys', project.fullname) if not os.path.exists(project_key_dir): - os.mkdir(project_key_dir) + os.makedirs(project_key_dir) for keyfile in os.listdir(project_key_dir): if keyfile not in keyfiles: