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

Proposed by Lars Düsing
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~lars.duesing/ubuntu/precise/aiccu/aiccu-upstart-server-patch-precise
Merge into: lp:ubuntu/precise/aiccu
Diff against target: 80 lines (+47/-2)
4 files modified
debian/aiccu.install (+1/-0)
debian/aiccu.py (+26/-0)
debian/aiccu.upstart (+2/-2)
debian/changelog (+18/-0)
To merge this branch: bzr merge lp:~lars.duesing/ubuntu/precise/aiccu/aiccu-upstart-server-patch-precise
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+111610@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1doc/aiccu.conf usr/share/aiccu/conf-templates1doc/aiccu.conf usr/share/aiccu/conf-templates
2debian/brokers.list usr/share/aiccu/conf-templates2debian/brokers.list usr/share/aiccu/conf-templates
3debian/60aiccu etc/pm/sleep.d3debian/60aiccu etc/pm/sleep.d
4debian/aiccu.py usr/share/apport/package-hooks
45
=== 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 @@
1from apport.hookutils import *
2
3def mask_string (str):
4 MASK = '##MASKED##'
5 return str.group(1) + MASK
6
7def mask_values(confinfo):
8 """ strip personal/private information from the conf entries """
9 pattrn = re.compile ('((username|password|tunnel_id) )(.*)$', re.IGNORECASE)
10 newReport = ""
11 for line in confinfo.splitlines():
12 line = pattrn.sub (mask_string, line)
13 newReport += line + '\n'
14 return newReport
15
16def add_info(report, ui=None):
17 attach_file_if_exists(report, '/var/log/aiccu.log', key='var.log.aiccu.log')
18 attach_file_if_exists(report, '/etc/aiccu.conf', key='etc.aiccu.conf')
19 try:
20 report['etc.aiccu.conf'] = mask_values(report['etc.aiccu.conf'])
21 except KeyError:
22 pass
23 try:
24 report['modified.conffile..etc.aiccu.conf'] = mask_values(report['modified.conffile..etc.aiccu.conf'])
25 except KeyError:
26 pass
027
=== 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 @@
65 # Workaround race with local DNS services65 # Workaround race with local DNS services
66 server=$(grep "^server" /etc/aiccu.conf | awk '{ print $2 }')66 server=$(grep "^server" /etc/aiccu.conf | awk '{ print $2 }')
67 if [ -z "$server" ]; then67 if [ -z "$server" ]; then
68 log "No server configuration specified"68 log "No server configuration specified - defaulting to tic.sixxs.net"
69 exit 169 server="tic.sixxs.net"
70 fi70 fi
71 log "Checking access to $server: "71 log "Checking access to $server: "
72 count=072 count=0
7373
=== 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 @@
1aiccu (20070115-14.1ubuntu3.2) precise-proposed; urgency=low
2
3 * upstart-script did not honour default server tic.sixxs.net
4 (LP: #1007408)
5
6 -- Lars Duesing <lars.duesing@camelotsweb.de> Fri, 22 Jun 2012 16:11:05 +0200
7
8aiccu (20070115-14.1ubuntu3.1) precise-security; urgency=low
9
10 * SECURITY UPDATE: Remove personal data (username, password, tunnel_id)
11 in apport-reports (LP: #1001432)
12 - added debian/aiccu.py: added a specialized apport-hook which masks
13 the data before it is sent to launchpad.
14 - changed debian/aiccu.install: installs the apport-hook
15 * Add apport hook for /var/log/aiccu.log
16
17 -- Lars Duesing <lars.duesing@camelotsweb.de> Mon, 11 Jun 2012 15:31:22 +0200
18
1aiccu (20070115-14.1ubuntu3) precise; urgency=low19aiccu (20070115-14.1ubuntu3) precise; urgency=low
220
3 [ Lars Duesing ]21 [ Lars Duesing ]

Subscribers

People subscribed via source and target branches

to all changes: