Skip to content

Fixing usage for different cases #52

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
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixing usage for different cases #52

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46d67e2
fixing usage for different cases
preved911 Feb 27, 2022
88eb9fa
fixed "--git" flag definition
preved911 Feb 27, 2022
696f8c4
fixed gh token auth flow
preved911 Feb 28, 2022
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
56 changes: 34 additions & 22 deletions github_backup/github_backup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@


import os
import re
import errno
import codecs
import json
Expand Down Expand Up @@ -71,14 +72,13 @@ def main():
args.backupdir = args.backupdir.rstrip("/")

# Make the connection to Github here.
config = {}
config = {'login_or_token': args.login_or_token}
if args.password == False:
# no password option given, continue unauthenticated
# unauthenticated users can only use http git method
args.type = 'http'
elif args.password == None:
# password option given, but no password value given
config = {'login_or_token': args.login_or_token}
if os.path.isfile(CONFFILE):
cfg = ConfigParser()
cfg.read(CONFFILE)
Expand All @@ -91,7 +91,6 @@ def main():
if password:
config['password'] = password
else:
config = {'login_or_token': args.login_or_token}
config['password'] = args.password

LOGGER.debug("Github config: %r", config)
Expand All @@ -101,28 +100,33 @@ def main():
if not os.path.exists(args.backupdir):
mkdir_p(args.backupdir)

if args.organization:
if args.password:
account = gh.get_organization(args.organization)
else:
account = gh.get_organization(args.login_or_token)
else:
if args.username:
account = gh.get_user(args.username)
elif config.get('password', None):
account = gh.get_user()
else:
account = gh.get_user(args.login_or_token)

IS_AUTHORIZED = isinstance(account, github.AuthenticatedUser.AuthenticatedUser)
assert not (bool(config.get('password', None)) ^ IS_AUTHORIZED), account
while True:
try:
if args.organization:
account = gh.get_organization(args.organization)
else:
if args.username:
account = gh.get_user(args.username)
elif config.get('password', None):
account = gh.get_user()
else:
account = gh.get_user(args.login_or_token)

break
except github.BadCredentialsException:
LOGGER.info("Given login_or_token is not authenticated, ignoring...")
# Reset gh client, try without auth
gh = github.Github()

IS_AUTHORIZED = isinstance(account, (github.AuthenticatedUser.AuthenticatedUser, github.Organization.Organization))
assert (bool(config.get('password', None)) or IS_AUTHORIZED), account

if args.include_keys and not IS_AUTHORIZED:
LOGGER.info("Cannot backup keys with unauthenticated account, ignoring...")
args.include_keys = False

filters = {}
if IS_AUTHORIZED:
if isinstance(account, github.AuthenticatedUser.AuthenticatedUser):
# Get all repos
filters = {
'affiliation': ','.join(args.affiliation),
Expand Down Expand Up @@ -162,7 +166,7 @@ def init_parser():
parser.add_argument("-m", "--mirror", help="Create a bare mirror", action="store_true")
parser.add_argument("-f", "--skip-forks", help="Skip forks", action="store_true")
parser.add_argument("--skip-repos", help="Skip backing up repositories", action="store_true")
parser.add_argument("-g", "--git", nargs="+", help="Pass extra arguments to git", type=list, default=[], metavar="ARGS")
parser.add_argument("-g", "--git", help="Pass extra arguments to git", action='append', default=[], metavar="ARGS")
parser.add_argument("-t", "--type", help="Select the protocol for cloning", choices=['git', 'http', 'ssh'], default='ssh')
parser.add_argument("-s", "--suffix", help="Add suffix to repository directory names", default="")
parser.add_argument("-u", "--username", help="Backup USER account", metavar="USER")
Expand Down Expand Up @@ -329,12 +333,20 @@ def __init__(self, repo, args):

if self.is_gist:
url = repo.git_pull_url
elif args.type == 'http' or not IS_AUTHORIZED:
url = repo.clone_url
elif args.type == 'ssh':
url = repo.ssh_url
elif args.type == 'git':
url = repo.git_url
elif args.type == 'http' or not IS_AUTHORIZED:
if re.match('^ghp_.+$', args.login_or_token):
url = re.sub('^https://', f'https://{args.login_or_token}:x-auth-basic@', repo.clone_url)
elif args.password:
if args.username:
url = re.sub('^https://', f'https://{args.username}:{args.password}@', repo.clone_url)
else:
url = re.sub('^https://', f'https://{args.login_or_token}:{args.password}@', repo.clone_url)
else:
url = repo.clone_url
self.url = url

self.wiki_url = None
Expand Down