Merge lp:~lars.duesing/ubuntu/precise/aiccu/aiccu-upstart-server-patch-precise into lp:ubuntu/precise/aiccu

[Lars Düsing]

=== modified file 'debian/aiccu.install'
--- debian/aiccu.install	2010-01-06 10:02:24 +0000
+++ debian/aiccu.install	2012-06-22 15:11:03 +0000
@@ -1,3 +1,4 @@
 doc/aiccu.conf  usr/share/aiccu/conf-templates
 debian/brokers.list usr/share/aiccu/conf-templates
 debian/60aiccu  etc/pm/sleep.d
+debian/aiccu.py	usr/share/apport/package-hooks

=== added file 'debian/aiccu.py'
--- debian/aiccu.py	1970-01-01 00:00:00 +0000
+++ debian/aiccu.py	2012-06-22 15:11:03 +0000
@@ -0,0 +1,26 @@
+from apport.hookutils import *
+
+def mask_string (str):
+    MASK = '##MASKED##'
+    return str.group(1) + MASK
+
+def mask_values(confinfo):
+    """ strip personal/private information from the conf entries """
+    pattrn = re.compile ('((username|password|tunnel_id) )(.*)$', re.IGNORECASE)
+    newReport = ""
+    for line in confinfo.splitlines():
+        line = pattrn.sub (mask_string, line)
+        newReport += line + '\n'
+    return newReport
+
+def add_info(report, ui=None):
+	attach_file_if_exists(report, '/var/log/aiccu.log', key='var.log.aiccu.log')
+	attach_file_if_exists(report, '/etc/aiccu.conf', key='etc.aiccu.conf')
+	try:
+		report['etc.aiccu.conf'] = mask_values(report['etc.aiccu.conf'])
+	except KeyError:
+		pass
+	try:
+		report['modified.conffile..etc.aiccu.conf'] = mask_values(report['modified.conffile..etc.aiccu.conf'])
+	except KeyError:
+		pass

=== modified file 'debian/aiccu.upstart'
--- debian/aiccu.upstart	2012-04-02 11:40:44 +0000
+++ debian/aiccu.upstart	2012-06-22 15:11:03 +0000
@@ -65,8 +65,8 @@
     # Workaround race with local DNS services
     server=$(grep "^server" /etc/aiccu.conf | awk '{ print $2 }')
     if [ -z "$server" ]; then
-        log "No server configuration specified"
-        exit 1
+        log "No server configuration specified - defaulting to tic.sixxs.net"
+        server="tic.sixxs.net"
     fi
     log "Checking access to $server: "
     count=0

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-02 11:40:44 +0000
+++ debian/changelog	2012-06-22 15:11:03 +0000
@@ -1,3 +1,21 @@
+aiccu (20070115-14.1ubuntu3.2) precise-proposed; urgency=low
+
+  * upstart-script did not honour default server tic.sixxs.net 
+    (LP: #1007408)
+
+ -- Lars Duesing <[e-mail]>  Fri, 22 Jun 2012 16:11:05 +0200
+
+aiccu (20070115-14.1ubuntu3.1) precise-security; urgency=low
+
+  * SECURITY UPDATE: Remove personal data (username, password, tunnel_id)
+    in apport-reports (LP: #1001432)
+    - added debian/aiccu.py: added a specialized apport-hook which masks
+      the data before it is sent to launchpad.
+    - changed debian/aiccu.install: installs the apport-hook
+  * Add apport hook for /var/log/aiccu.log 
+
+ -- Lars Duesing <[e-mail]>  Mon, 11 Jun 2012 15:31:22 +0200
+
 aiccu (20070115-14.1ubuntu3) precise; urgency=low
 
   [ Lars Duesing ]