From ecfddb4165675f54b084779a1942a2f5caf070ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20L=C3=BChne?= <patrick@luehne.de>
Date: Wed, 21 Mar 2018 12:33:33 +0100
Subject: [PATCH] Fix tokenless authentication chart

The format of the gitauth.log file changed from GitHub Enterprise 2.11
to 2.12. This makes it necessary to adjust the regular expression
responsible for fetching user names and repositories.

Unfortunately, it seems that we can no longer rely on the order of the
fields in gitauth.log. For this reason, multiple grep iterations are
performed and the regular expression is changed to use look-aheads to
allow for arbitrary field orders.

For backward compatibility with GitHub Enterprise 2.11 and earlier, a
switch is implemented that executes the old query if necessary.
---
 updater/scripts/tokenless-auth.sh | 37 ++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/updater/scripts/tokenless-auth.sh b/updater/scripts/tokenless-auth.sh
index 97b14fe3..5bbca92c 100644
--- a/updater/scripts/tokenless-auth.sh
+++ b/updater/scripts/tokenless-auth.sh
@@ -3,11 +3,36 @@
 # Lists users that make the most requests with username/password
 # c.f. https://help.github.com/enterprise/2.11/admin/guides/user-management/using-ldap/#disabling-password-authentication-for-git-operations
 #
+
+function ghe_greater_equal () {
+    cat /etc/github/enterprise-release |
+        perl -sne '
+            use version;
+            my ($installed) = $_ =~ /RELEASE_VERSION="([0-9]+([.][0-9]+)+)"/;
+            exit (version->parse($installed) lt version->parse($required));
+        ' -- -required="$1"
+    return $?
+}
+
 echo -e "user\trepository\ttokenless authentications"
 
-zcat -f /var/log/github/gitauth.log.1* |
-    perl -ne 'print if s/.*status=OK member="?([^ "]+) hashed_token=nil.*path=([^ ]+)\.git .*proto=http.*/\1 \2/' |
-    sort |
-    uniq -c |
-    sort -rn |
-    awk '{gsub(/[_.]/, "-", $2); printf("%s\t%s\t%s\n",$2,$3,$1)}'
+# The log file format changed with 2.12, and some of the fields might appear in inconsistent order now
+if ghe_greater_equal "2.12.0"
+then
+	zcat -f /var/log/github/gitauth.log.1* |
+		grep -v 'hashed_token' |
+		grep 'proto=http' |
+		grep 'status=200' |
+		perl -ne 'print if s/^(?=.*member="?([^ "]+))(?=.*path=([^ ]+)\.git).*/\1 \2/' |
+		sort |
+		uniq -c |
+		sort -rn |
+		awk '{gsub(/[_.]/, "-", $2); printf("%s\t%s\t%s\n",$2,$3,$1)}'
+else
+	zcat -f /tmp/gitauth.log.1* |
+		perl -ne 'print if s/.*status=OK member="?([^ "]+) hashed_token=nil.*path=([^ ]+)\.git .*proto=http.*/\1 \2/' |
+		sort |
+		uniq -c |
+		sort -rn |
+		awk '{gsub(/[_.]/, "-", $2); printf("%s\t%s\t%s\n",$2,$3,$1)}'
+fi