FOR DEBUGING ONLINE, DO NOT MERGE!

USBGuard · Jul 31, 2019 · 4fc3385 · 4fc3385
1 parent 6a12b26
commit 4fc3385
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 5 deletions.
diff --git a/src/Tests/LDAP/UseCase/ldap-test-1.sh b/src/Tests/LDAP/UseCase/ldap-test-1.sh
@@ -94,7 +94,9 @@ ${LDAP_UTIL} delete && true
 ${LDAP_UTIL} setup
 ${LDAP_UTIL} policy "${TMPDIR}/policy.ldif"
 
-sudo -n ${USBGUARD_DAEMON} -Pd -f -c $config_path 2> $TMPDIR/usbguard.log
+sudo -n strace -f -o "${TMPDIR}/debug.log" -s256 -e trace=write \
+    ${USBGUARD_DAEMON} -Pd -f -c $config_path 2> $TMPDIR/usbguard.log &
+sleep 1
 RC=$?
 echo "RC == $RC"
 
@@ -130,6 +132,12 @@ then
     sudo -n sh -c "cp ${TMPDIR}/usbguard-ldap.conf.back /etc/usbguard/usbguard-ldap.conf"
 fi
 
+# Get stderr, signals, and exits from usbguard-daemon.
+if [ "${GREP1}" -ne "0" ]
+then
+    grep 'write(2,\|SIG\|exit' "$TMPDIR/debug.log"
+fi
+
 nss_restore
 
 exit $(( $RC + $GREP + $KILLRC ))
diff --git a/src/Tests/LDAP/UseCase/ldap-test-2.sh b/src/Tests/LDAP/UseCase/ldap-test-2.sh
@@ -94,7 +94,10 @@ ${LDAP_UTIL} delete && true
 ${LDAP_UTIL} setup
 # ${LDAP_UTIL} policy "${TMPDIR}/policy.ldif"
 
-sudo -n ${USBGUARD_DAEMON} -Pd -f -c $config_path 2> $TMPDIR/usbguard.log
+
+sudo -n strace -f -o "${TMPDIR}/debug.log" -s256 -e trace=write \
+    ${USBGUARD_DAEMON} -Pd -f -c $config_path 2> $TMPDIR/usbguard.log
+sleep 1
 RC=$?
 echo "RC == $RC"
 
@@ -130,6 +133,12 @@ then
     sudo -n sh -c "cp ${TMPDIR}/usbguard-ldap.conf.back /etc/usbguard/usbguard-ldap.conf"
 fi
 
+# Get stderr, signals, and exits from usbguard-daemon.
+if [ "${GREP1}" -ne "0" ]
+then
+    grep 'write(2,\|SIG\|exit' "$TMPDIR/debug.log"
+fi
+
 nss_restore
 
 exit $(( $RC + $GREP + $KILLRC ))
diff --git a/src/Tests/LDAP/UseCase/ldap-test-3.sh b/src/Tests/LDAP/UseCase/ldap-test-3.sh
@@ -94,7 +94,9 @@ ${LDAP_UTIL} delete && true
 # ${LDAP_UTIL} setup
 # ${LDAP_UTIL} policy "${TMPDIR}/policy.ldif"
 
-sudo -n ${USBGUARD_DAEMON} -Pd -f -c $config_path 2> $TMPDIR/usbguard.log
+sudo -n strace -f -o "${TMPDIR}/debug.log" -s256 -e trace=write \
+    ${USBGUARD_DAEMON} -Pd -f -c $config_path 2> $TMPDIR/usbguard.log
+sleep 1
 RC=$?
 echo "RC == $RC"
 
@@ -149,6 +151,12 @@ then
     sudo -n sh -c "cp ${TMPDIR}/usbguard-ldap.conf.back /etc/usbguard/usbguard-ldap.conf"
 fi
 
+# Get stderr, signals, and exits from usbguard-daemon.
+if [ "${GREP1}" -ne "0" ]
+then
+    grep 'write(2,\|SIG\|exit' "$TMPDIR/debug.log"
+fi
+
 nss_restore
 
 exit $(( $RC + $GREP1 + $GREP2 + $KILLRC ))
diff --git a/src/Tests/LDAP/UseCase/ldap-test-4.sh b/src/Tests/LDAP/UseCase/ldap-test-4.sh
@@ -98,7 +98,9 @@ sudo -n service slapd stop
 
 service slapd status
 
-sudo -n ${USBGUARD_DAEMON} -Pd -f -c $config_path 2> $TMPDIR/usbguard.log
+sudo -n strace -f -o "${TMPDIR}/debug.log" -s256 -e trace=write \
+    ${USBGUARD_DAEMON} -Pd -f -c $config_path 2> $TMPDIR/usbguard.log
+sleep 1
 RC=$?
 echo "RC == $RC"
 
@@ -151,6 +153,12 @@ then
     sudo -n sh -c "cp ${TMPDIR}/usbguard-ldap.conf.back /etc/usbguard/usbguard-ldap.conf"
 fi
 
+# Get stderr, signals, and exits from usbguard-daemon.
+if [ "${GREP1}" -ne "0" ]
+then
+    grep 'write(2,\|SIG\|exit' "$TMPDIR/debug.log"
+fi
+
 nss_restore
 
 sudo -n service slapd start

diff --git a/src/Tests/LDAP/UseCase/ldap-test-5.sh b/src/Tests/LDAP/UseCase/ldap-test-5.sh
@@ -145,7 +145,9 @@ ${LDAP_UTIL} delete && true
 ${LDAP_UTIL} setup
 ${LDAP_UTIL} policy "${TMPDIR}/policy.ldif"
 
-sudo -n ${USBGUARD_DAEMON} -Pd -f -c $config_path 2> $TMPDIR/usbguard.log
+sudo -n strace -f -o "${TMPDIR}/debug.log" -s256 -e trace=write \
+    ${USBGUARD_DAEMON} -Pd -f -c $config_path 2> $TMPDIR/usbguard.log
+sleep 1
 RC=$?
 echo "RC == $RC"
 
@@ -195,6 +197,12 @@ then
     sudo -n sh -c "cp ${TMPDIR}/usbguard-ldap.conf.back /etc/usbguard/usbguard-ldap.conf"
 fi
 
+# Get stderr, signals, and exits from usbguard-daemon.
+if [ "${GREP1}" -ne "0" ]
+then
+    grep 'write(2,\|SIG\|exit' "$TMPDIR/debug.log"
+fi
+
 nss_restore
 
 exit $(( $RC + $GREP + $KILLRC + $WC + $DIFF ))