Changeset 2962

Timestamp:

Nov 30, 2016, 4:04:39 PM (3 years ago)

Author:

mabarracus

Message:

Add debug verbosity
Fixes confirmator logic
Fixes acl's

Location:

lliurex-statistics/trunk/fuentes

Files:

• debian/changelog (modified) (1 diff)
• debian/lliurex-statistics.postinst (modified) (1 diff)
• lliurex-statistics.install/etc/init.d/analytics (modified) (3 diffs)
• lliurex-statistics.install/usr/bin/confirmator (modified) (4 diffs)
• lliurex-statistics.install/usr/sbin/analytics (modified) (4 diffs)

lliurex-statistics/trunk/fuentes/debian/changelog

@@ +1 @@
+lliurex-statistics (0.2-2) xenial; urgency=medium
+
+  * Add debug verbosity
+  * Fixes confirmator logic
+  * Fixes acl's
+
+ -- M.Angel Juan <m.angel.juan@gmail.com>  Wed, 30 Nov 2016 13:11:00 +0100
+
 lliurex-statistics (0.2-1) xenial; urgency=medium
 

lliurex-statistics/trunk/fuentes/debian/lliurex-statistics.postinst

@@ -48 +48 @@
             echo -e "-a exit,always -F arch=b32 -F euid>999 -S execve\n" >> /etc/audit/rules.d/analytics.rules
             touch /etc/lliurex-analytics/status
+
+            #USELESS INTO SQUASHED FS, LOGIC INTO STARTUP SERVICE
             # 10003 (fixed group into ldap 4 teachers)
-            setfacl -m g:10003:rw /etc/lliurex-analytics/status
-            setfacl -m g:adm:rw /etc/lliurex-analytics/status
+            #echo "setting acl's"
+            #setfacl -m g:10003:rw /etc/lliurex-analytics/status
+            #setfacl -m g:adm:rw /etc/lliurex-analytics/status
+            #getfacl /etc/lliurex-analytics/status
+            
             service auditd restart
     ;;

lliurex-statistics/trunk/fuentes/lliurex-statistics.install/etc/init.d/analytics

@@ -20 +20 @@
 PIDFILE=/var/run/"$NAME".pid
 SCRIPTNAME=/etc/init.d/"$NAME"
+STATUS_FILE=/etc/lliurex-analytics/status
 
 # Exit if the package is not installed
@@ -30 +31 @@
 . /lib/lsb/init-functions
 
+set_acls()
+{
+    if [ -w "${STATUS_FILE}" ]; then
+        # fixed group 10003 for teachers into ldap
+        setfacl -m g:10003:rw ${STATUS_FILE}
+        setfacl -m g:adm:rw ${STATUS_FILE}
+    fi
+}
 #
 # Function that starts the daemon/service
@@ -39 +48 @@
         #   1 if daemon was already running
         #   2 if daemon could not be started
+        set_acls
         start-stop-daemon --start --quiet --pidfile "$PIDFILE" --exec "$DAEMON" -- \
                 $EXTRAOPTIONS \

lliurex-statistics/trunk/fuentes/lliurex-statistics.install/usr/bin/confirmator

@@ -19 +19 @@
 fi      
 DPKG="$(${WHICH} dpkg)"
-GREP="$(${WHICH} grep)"
+GREP="$(${WHICH} egrep)"
 
 if [ -z "${DPKG}" -o -z "${GREP}" ]; then 
@@ -62 +62 @@
 
 # INSTALLATION TYPE DETECTION & ACKNOWLEDGE TYPES
-RUN_ON_LIVE="$(${FINDMNT} -P -t squashfs|${GREP} 'target="/rofs" source="/dev/loop"')"
+RUN_ON_LIVE="$(${FINDMNT} -P -t squashfs|${GREP} -i 'target="/rofs" source="/dev/loop[0-9]?"')"
 
 if [ -n "${RUN_ON_LIVE}" ]; then
@@ -76 +76 @@
 fi
 
-#NOT USED INSIDE CONFIRMATOR, THIS LOGIC IS INTO COLLECTOR
-SERVER_OVERRRIDE="$(${N4DCLI} -h server -c VariablesManager -m get_variable -a 'STATS_ENABLED'|${GREP} -i yes)"
-if [ -n "${SERVER_OVERRIDE}" ]; then
-    exit 0
+RUN_AS_CLIENT=$(${LLIUREX_VERSION} |${GREP} -i client)
+RUN_AS_SERVER=$(${LLIUREX_VERSION} |${GREP} -i server)
+RUN_AS_DESKTOP=""
+if [ -z ${RUN_AS_CLIENT} -a -z ${RUN_AS_SERVER} ];then
+    RUN_AS_DESKTOP="yes"
+else
+    #NOT USED INSIDE CONFIRMATOR, THIS LOGIC IS INTO COLLECTOR AND WILL BE ACCEPTED NOT NEED WRITE THE LOCAL FILE
+    SERVER_OVERRRIDE="$(${N4DCLI} -h server -c VariablesManager -m get_variable -a 'STATS_ENABLED'|${GREP} '1')"
+    if [ -n "${SERVER_OVERRIDE}" ]; then
+        exit 0
+    fi
 fi
 
@@ -86 +93 @@
 DEBCONF_ACKNOWLEDGE="$(echo get lliurex-statistics/acknowledge|${DEBCONF_COMM} 2>/dev/null |${GREP} -E -i -o 'true|false')"
 
-# NOT NEEDED
-#RUN_AS_CLIENT=$(${LLIUREX_VERSION} |${GREP} -i client)
-#RUN_AS_SERVER=$(${LLIUREX_VERSION} |${GREP} -i server)
-#RUN_AS_DESKTOP=""
-#if [ -z ${RUN_AS_CLIENT} -a -z ${RUN_AS_SERVER} ];then
-#    RUN_AS_DESKTOP="yes"
-#fi
 
 # DIALOG FUNCTION 

lliurex-statistics/trunk/fuentes/lliurex-statistics.install/usr/sbin/analytics

@@ -79 +79 @@
             # Send data to master server
             send_data()
+        else:
+            debug("Sending not allowed when try to change file")
         # Get new temporary filename
         next_filename=get_filename(LOGPATH)
@@ -108 +110 @@
         try:
             if answer == "yes":
+                debug("allow_send stats by check local acknowledge")
                 return True
             else:
+                debug("deny allow_send stats by check server & local acknowledge")
                 return False
         except Exception as e:
+            debug("deny allow_send stats by exception check server & local acknowledge")
             return False
     else:
+        debug("allow_send stats by check server acknowledge")
         return True
 #END def allow_send()
@@ -129 +135 @@
             # Send data to master server
             send_data()
+        else
+            debug("Sending not allowed when try send file")
         # Clear database file
         clear_db()
@@ -279 +287 @@
     jsonobj=json.dumps({'uid':uid,'vers':version,'sab':sabor, 'stats': jsonobj });
     payload = {'stats':jsonobj};
+    try:
+        debug("SENDING DATA:"+str(payload))
+    except Exception as e:
+        debug("Error debugging data to send")
+
     r = requests.post(url,data=payload,headers=headers);
     debug("S("+r.text+')',2);