Merge branch 'release/0.4.1-beta'

.travis.yml

@@ -22,5 +22,5 @@ script:
   - ./configure
   - make
   - make check
-  - cat tests/test-suite.log
+  - cat test/test-suite.log
 

ChangeLog

@@ -1,3 +1,10 @@
+[0.4.1-beta] - 2018-04-05
+-------------------------
+
+* Removed underscores from environment variable in authorized_keys file
+  to fulfil checks introduced by OpenSSH 7.7
+
+
 [0.4.0-beta] - 2018-04-01
 -------------------------
 

build/centos/keeto.spec

@@ -2,7 +2,7 @@
 %global top_level_directory %{name}-%{version}-%{beta_tag}
 
 Name: keeto
-Version: 0.4.0
+Version: 0.4.1
 Release: 0.1.%{beta_tag}%{?dist}
 Summary: Key and Access Management for OpenSSH
 License: GPLv3+
@@ -58,6 +58,9 @@ make check
 %license COPYING
 
 %changelog
+* Thu Apr 05 2018 Sebastian Roland <[email protected]> - 0.4.1-0.1.beta
+- Bump version.
+
 * Sun Apr 01 2018 Sebastian Roland <[email protected]> - 0.4.0-0.1.beta
 - Bump version.
 

build/docker/.env

@@ -1,5 +1,5 @@
-VERSION=0.4.0-beta
-KEETO_RPM_URL=https://keeto.io/static/downloads/keeto-0.4.0-beta/keeto-0.4.0-0.1.beta.el7.centos.x86_64.rpm
-OPENSSH_SRC_URL=https://ftp.hostserver.de/pub/OpenBSD/OpenSSH/portable/openssh-7.6p1.tar.gz
+VERSION=0.4.1-beta
+KEETO_RPM_URL=https://keeto.io/static/downloads/keeto-0.4.1-beta/keeto-0.4.1-0.1.beta.el7.centos.x86_64.rpm
+OPENSSH_SRC_URL=https://ftp.hostserver.de/pub/OpenBSD/OpenSSH/portable/openssh-7.7p1.tar.gz
 SYSLOG_NG_REPO_URL=https://copr.fedorainfracloud.org/coprs/czanik/syslog-ng314/repo/epel-7/czanik-syslog-ng314-epel-7.repo
 

build/docker/keeto-openssh/Dockerfile

@@ -1 +1 @@
-Dockerfile-prod
+Dockerfile-dev

build/docker/keeto-openssh/config/ps1.sh

@@ -1,5 +1,5 @@
-if [ "${KEETO_REAL_USER}" ]; then
-    PS1="[\u~"${KEETO_REAL_USER}"@\h \W]\$ "
+if [ "${KEETOREALUSER}" ]; then
+    PS1="[\u~"${KEETOREALUSER}"@\h \W]\$ "
 else
     PS1="[\u@\h \W]\$ "
 fi

configure.ac

@@ -1,6 +1,6 @@
 # prelude.
 AC_PREREQ([2.69])
-AC_INIT([keeto], [0.4.0-beta], [[email protected]], [], [https://keeto.io])
+AC_INIT([keeto], [0.4.1-beta], [[email protected]], [], [https://keeto.io])
 AC_LANG([C])
 AC_CONFIG_SRCDIR([src/keeto.c])
 AC_CONFIG_AUX_DIR([build-aux])

samples/docker/.env

@@ -1,3 +1,3 @@
-VERSION=0.4.0-beta
+VERSION=0.4.1-beta
 DOMAINNAME=docker.keeto.io
 

src/keeto.c

@@ -142,7 +142,7 @@ write_keystore(char *keystore, struct keeto_keystore_records *keystore_records)
 
     struct keeto_keystore_record *keystore_record = NULL;
     SIMPLEQ_FOREACH(keystore_record, keystore_records, next) {
-        fprintf(tmp_keystore_file, "environment=\"KEETO_REAL_USER=%s\"",
+        fprintf(tmp_keystore_file, "environment=\"KEETOREALUSER=%s\"",
             keystore_record->uid);
         bool command_option_set = keystore_record->command_option != NULL ?
             true : false;