From b6301c3033318852c3d047fe64c4f17153065f19 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Fri, 29 May 2020 08:54:31 +0200 Subject: [PATCH] Apply password policy of gitea, fallback email address, display gitlab version --- migrate.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/migrate.py b/migrate.py index c4faeb4..f401eb8 100644 --- a/migrate.py +++ b/migrate.py @@ -41,7 +41,7 @@ def main(): gl = gitlab.Gitlab(GITLAB_URL, private_token=GITLAB_TOKEN) gl.auth() assert(isinstance(gl.user, gitlab.v4.objects.CurrentUser)) - + print_info("Connected to Gitlab, version: " + str(gl.version())) gt = pygitea.API(GITEA_URL, token=GITEA_TOKEN) gt_version = gt.get('/version').json() @@ -438,9 +438,14 @@ def _import_users(gitea_api: pygitea, users: [gitlab.v4.objects.User], notify: b print("Found " + str(len(keys)) + " public keys for user " + user.username) if not user_exists(gitea_api, user.username): - tmp_password = ''.join(random.choices(string.ascii_uppercase + string.digits, k=10)) + tmp_password = 'Tmp1!' + ''.join(random.choices(string.ascii_uppercase + string.digits, k=10)) + tmp_email = user.username + '@noemail-git.local' # Some gitlab instances do not publish user emails + try: + tmp_email = user.email + except AttributeError: + pass import_response: requests.Response = gitea_api.post("/admin/users", json={ - "email": user.email, + "email": tmp_email, "full_name": user.name, "login_name": user.username, "password": tmp_password,