Merge ~kirkland/ssh-import-id:master into ssh-import-id:master

[Dustin Kirkland ]

Added support for Gitlab

Added support for Gitlab

Unmerged commits

17a4c7d... by Dustin Kirkland  on 2023-06-27

added Gitlab support

diff --git a/README.md b/README.md
index e839b64..5bea7d5 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Oh. You have to ask them to cat their public SSH key, paste it into IRC (wait, n
 
 That's where ssh-import-id comes in. With ssh-import-id, you can add the public SSH keys from a known, trusted online identity to grant SSH access.
 
-Currently supported identities include Github and Launchpad.
+Currently supported identities include Github, Gitlab, and Launchpad.
 
 Usage
 -----
@@ -16,6 +16,7 @@ Usage
 ssh-import-id uses short prefix to indicate the location of the online identity. For now, these are:
 
     'gh:' for Github
+    'gl:' for Gitlab
     'lp:' for Launchpad
 
 Command line help:
@@ -41,7 +42,7 @@ If you wanted me to be able to ssh into your server, as the desired user on that
 
 You can also import multiple users on the same line, even from different key services, like so:
 
-    $ ssh-import-id gh:cmars lp:kirkland
+    $ ssh-import-id gh:cmars lp:kirkland gl:speeves
 
 Used with care, it's a great collaboration tool!
 
diff --git a/debian/changelog b/debian/changelog
index 32ed111..13e6200 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ssh-import-id (5.12) unreleased; urgency=medium
+
+  [ Dustin Kirkland, Shannon Eric Peevey, Gabriel Mazetto ]
+  * debian/control, debian/copyright, debian/links, README.md, setup.py,
+    ssh_import_id/__init__.py, usr/share/man/man1/ssh-import-id.1:
+    - adding support for Gitlab.com
+
+ -- Dustin Kirkland <[e-mail]>  Mon, 26 Jun 2023 19:50:29 -0500
+
 ssh-import-id (5.11-0ubuntu1) hirsute; urgency=medium
 
   * Upstream Release 5.11
diff --git a/debian/changelog.trunk b/debian/changelog.trunk
deleted file mode 100644
index 39d90e2..0000000
--- a/debian/changelog.trunk
+++ /dev/null
@@ -1,5 +0,0 @@
-ssh-import-id (UPSTREAM_VER-0~upstream0) UNRELEASED; urgency=medium
-
-  * UNRELEASED
-
- -- Dustin Kirkland <[e-mail]>  Tue, 11 Jul 2017 15:51:44 -0500
diff --git a/debian/control b/debian/control
index 99c5b75..e24998e 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,6 @@ Depends: ca-certificates,
 Recommends: openssh-server
 Description: securely retrieve an SSH public key and install it locally
  This utility will securely contact a public keyserver (Launchpad.net by
- default, but Github.com is also supported), retrieve one or more user's
- public keys, and append these to the current user's ~/.ssh/authorized_keys
- file.
+ default, but Github.com and Gitlab.com are also supported), retrieve one
+ or more user's public keys, and append these to the current user's
+ ~/.ssh/authorized_keys file.
diff --git a/debian/copyright b/debian/copyright
index bb8e48a..ffedd84 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,7 @@ Upstream-Contact: Dustin Kirkland <[e-mail]>
 Files: *
 Copyright: 2010, Canonical Ltd.
            2013, Casey Marshall <[e-mail]>
-           2013, Dustin Kirkland <[e-mail]>
+           2013-2023, Dustin Kirkland <[e-mail]>
 License: GPL-3
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
diff --git a/debian/links b/debian/links
index 1ad132a..39d8ac8 100644
--- a/debian/links
+++ b/debian/links
@@ -1,2 +1,3 @@
 usr/share/man/man1/ssh-import-id.1 usr/share/man/man1/ssh-import-id-lp.1
 usr/share/man/man1/ssh-import-id.1 usr/share/man/man1/ssh-import-id-gh.1
+usr/share/man/man1/ssh-import-id.1 usr/share/man/man1/ssh-import-id-gl.1
diff --git a/debian/rules b/debian/rules
index 75bb1da..f66f72d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,13 +3,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_VERSION := $(shell dpkg-parsechangelog --show-field=Version)
-
 %:
 	dh $@ --with python3 --buildsystem=pybuild
 
-override_dh_auto_install:
-	dh_auto_install
-	# upstream provides a way to patch in the distro
-	# version by replacing @@PACKAGED_VERSION@@ in version.py
-	for f in $$(find $(CURDIR)/debian/ -type f -name version.py); do [ -f "$$f" ] || continue; sed -i 's,@@PACKAGED_VERSION@@,$(DEB_VERSION),' "$$f"; done
+override_dh_clean:
+	rm -rf *.egg-info/
+	dh_clean
diff --git a/setup.py b/setup.py
index f00afa6..45b5629 100755
--- a/setup.py
+++ b/setup.py
@@ -2,6 +2,7 @@
 #
 # ssh-import-id - Authorize SSH public keys from trusted online identities.
 # Copyright (c) 2013 Casey Marshall <[e-mail]>
+# Copyright (c) 2023 Dustin Kirkland <[e-mail]>
 #
 # ssh-import-id is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -50,7 +51,7 @@ setup(
     url='https://launchpad.net/ssh-import-id',
     platforms=['any'],
     packages=['ssh_import_id'],
-    scripts=['usr/bin/ssh-import-id-gh', 'usr/bin/ssh-import-id-lp'],
+    scripts=['usr/bin/ssh-import-id-gh', 'usr/bin/ssh-import-id-lp', 'usr/bin/ssh-import-id-gl'],
     install_requires=["distro"],
     entry_points={
         'console_scripts': [
diff --git a/ssh_import_id/__init__.py b/ssh_import_id/__init__.py
index 034adda..b8a05a9 100644
--- a/ssh_import_id/__init__.py
+++ b/ssh_import_id/__init__.py
@@ -3,7 +3,7 @@
 # ssh-import-id - Authorize SSH public keys from trusted online identities
 #
 # Copyright (c) 2013 Casey Marshall <[e-mail]>
-# Copyright (c) 2013 Dustin Kirkland <[e-mail]>
+# Copyright (c) 2013-2023 Dustin Kirkland <[e-mail]>
 #
 # ssh-import-id is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,6 +26,7 @@ except ImportError:
     JSONDecodeError = ValueError
 import logging
 import os
+import requests
 import subprocess
 import sys
 import tempfile
@@ -224,6 +225,8 @@ def fetch_keys(proto, username, useragent):
         return fetch_keys_lp(username, useragent)
     if proto == "gh":
         return fetch_keys_gh(username, useragent)
+    if proto == "gl":
+        return fetch_keys_gl(username, useragent)
 
     die("ssh-import-id protocol handler %s: not found or cannot execute" %
         (proto))
@@ -355,6 +358,23 @@ def fetch_keys_gh(ghid, useragent):
         die(str(e))
     return keys
 
+def fetch_keys_gl(glid, useragent):
+    try:
+        url = os.getenv("URL", None)
+        if url is not None:
+            url = url % (quote_plus(glid))
+        # Finally, fall back to gitlab.com
+        if url is None:
+            url = "https://gitlab.com/%s.keys" % (quote_plus(glid))
+        headers = {'User-Agent': user_agent(useragent)}
+        text = requests.get(url, verify=True, headers=headers).text
+        keys = str(text)
+    except (Exception,):
+        e = sys.exc_info()[1]
+        sys.stderr.write("ERROR: %s\n" % (str(e)))
+        os._exit(1)
+    return keys
+
 
 def main():
     errors = []
diff --git a/usr/bin/ssh-import-id-gl b/usr/bin/ssh-import-id-gl
new file mode 100644
index 0000000..5aa5fa7
--- /dev/null
+++ b/usr/bin/ssh-import-id-gl
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# ssh-import-id-gl - Authorize SSH public keys from trusted online identities.
+#
+# Copyright (c) 2016-2023 Dustin Kirkland <[e-mail]>
+# Copyright (c) 2022 Shannon Eric Peevey <[e-mail]>
+#
+# ssh-import-id is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 3.
+#
+# ssh-import-id is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with ssh-import-id.  If not, see <http://www.gnu.org/licenses/>.
+
+set -e
+
+for i in $@; do
+    ssh-import-id gl:$i
+done
diff --git a/usr/share/man/man1/ssh-import-id.1 b/usr/share/man/man1/ssh-import-id.1
index 6d26fa7..fa52bb5 100644
--- a/usr/share/man/man1/ssh-import-id.1
+++ b/usr/share/man/man1/ssh-import-id.1
@@ -9,12 +9,14 @@
 
 .BI "ssh\-import\-id\-gh USER_ID_1 [USER_ID_2] ... [USER_ID_n]
 
+.BI "ssh\-import\-id\-gl USER_ID_1 [USER_ID_2] ... [USER_ID_n]
+
 .SH OPTIONS
  \-h | \-\-help		usage
  \-o | \-\-output F	write output to file 'F' (default ~/.ssh/authorized_keys, use "\-" for standard out)
  \-r | \-\-remove  	remove keys from authorized keys file 'F'
  \-u | \-\-useragent U	append U to the user agent string
- PROTO:USER_ID		Protocol can be 'lp' for Launchpad.net, or 'gh' for Github.com
+ PROTO:USER_ID		Protocol can be 'lp' for Launchpad.net, 'gh' for Github.com, or 'gl' for Gitlab.com
 
 .SH DESCRIPTION
 This utility will securely contact a public keyserver and retrieve one or more user's public keys, and append these to the current user's \fI~/.ssh/authorized_keys\fP file, standard output or any other specified output file.
@@ -23,6 +25,7 @@ User IDs can be prepended by a protocol:
 
  - \fBlp:\fP to use \fIhttps://launchpad.net/~%s/+sshkeys\fP
  - \fBgh:\fP to use \fIhttps://api.github.com/users/%s/keys\fP
+ - \fBgl:\fP to use \fIhttps://gitlab.com/%s.keys\fP
 
 If the protocol is not explicitly specified, then \fBssh-import-id\fP will read a URL variable string from \fI/etc/ssh/ssh_import_id\fP as installed by your package manager and configured by your system administrator.  You can override this locally by exporting the string you want in a URL environment variable.  If all of these are empty, then the protocol is assumed to be "lp:", which was the original target implementation of this tool.