[Pkg-privacy-commits] [Git][pkg-privacy-team/monkeysphere][master] 2 commits: Always consume stdin when log is called without a message argument

[Ulrike Uhlig]

Ulrike Uhlig pushed to branch master at Privacy Maintainers / monkeysphere


Commits:
e7b1fd67 by Daniel Kahn Gillmor at 2014-11-26T19:37:07-05:00
Always consume stdin when log is called without a message argument

See the discussion about this in https://bugs.debian.org/635711

I'm hoping this will resolve the intermittent SIGPIPEs plaguing
monkeysphere's postinst.

I'm still unable to reproduce the problem.  If people who can
reproduce the problem could try this patch and report back if it fixes
things for them, that would be great.

- - - - -
321b5dca by Daniel Kahn Gillmor at 2015-05-05T12:11:00-04:00
fix diagnostic check and recommendation for good authorizedkeysfile in sshd_config

- - - - -


2 changed files:

- src/share/common
- src/share/ma/diagnostics


Changes:

=====================================
src/share/common
=====================================
--- a/src/share/common
+++ b/src/share/common
@@ -38,6 +38,7 @@ log() {
     local output
     local alllevels
     local found=
+    local written=
 
     # don't include SILENT in alllevels: it's handled separately
     # list in decreasing verbosity (all caps).
@@ -50,6 +51,9 @@ log() {
 
     # just go ahead and return if the log level is silent
     if [ "$LOG_LEVEL" = 'SILENT' ] ; then
+        if [ ! "$2" ] ; then
+            cat >/dev/null
+        fi
 	return
     fi
 
@@ -81,8 +85,12 @@ log() {
 	    else
 		cat
 	    fi | sed 's/^/'"${LOG_PREFIX}"'/' >&2
+            written=true
 	fi
     done
+    if [ "$written" != 'true' -a ! "$1" ]; then
+        cat >/dev/null
+    fi
 }
 
 # run command as monkeysphere user


=====================================
src/share/ma/diagnostics
=====================================
--- a/src/share/ma/diagnostics
+++ b/src/share/ma/diagnostics
@@ -122,9 +122,9 @@ echo "Checking for Monkeysphere-enabled public-key authentication for users ..."
 # Ensure that User ID authentication is enabled:
 if echo "AuthorizedKeysFile foo bar" | /usr/sbin/sshd -t -f /dev/stdin; then
     # OpenSSH >= 6.0, multiple authorized_keys file supported
-    if ! grep -q "^AuthorizedKeysFile[[:space:]]\+.*[[:space:]]\*${SYSDATADIR}/authorized_keys/%u$" "$sshd_config"; then
+    if ! grep -q "^AuthorizedKeysFile[[:space:]]\+.*[[:space:]]*${SYSDATADIR}/authorized_keys/%u$" "$sshd_config"; then
         echo "! $sshd_config does not point to monkeysphere authorized keys."
-        echo " - Recommendation: add a line to $sshd_config: 'AuthorizedKeysFile .ssh/authorized_keys .ssh/authorized_keys2 ${SYSDATADIR}/authorized_keys/%u'"
+        echo " - Recommendation: add a line to $sshd_config: 'AuthorizedKeysFile %h/.ssh/authorized_keys %h/.ssh/authorized_keys2 ${SYSDATADIR}/authorized_keys/%u'"
         problemsfound=$(($problemsfound+1))
     fi
     if [ "$RAW_AUTHORIZED_KEYS" != none ]; then



View it on GitLab: https://salsa.debian.org/pkg-privacy-team/monkeysphere/compare/2919f852cc4c822841b0176a4a291407b8f9eb4f...321b5dca3604699a1abd8e60cfcf196b005f60c7

-- 
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/monkeysphere/compare/2919f852cc4c822841b0176a4a291407b8f9eb4f...321b5dca3604699a1abd8e60cfcf196b005f60c7
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-privacy-commits/attachments/20180528/4d7bc252/attachment-0001.html>