1
=== modified file 'data/squid.conf.in'
2
--- data/squid.conf.in	2012-04-24 17:58:16 +0000
3
+++ data/squid.conf.in	2013-09-18 20:21:43 +0000
4
@@ -2,7 +2,6 @@
5
2
# Use a default auth using ncsa and the passed generated file.
2
# Use a default auth using ncsa and the passed generated file.
6
3
auth_param basic program ${auth_process} ${auth_file}
3
auth_param basic program ${auth_process} ${auth_file}
7
4
#Recommended minimum configuration:
4
#Recommended minimum configuration:
8
5
acl manager proto cache_object
9
6
acl localhost src 127.0.0.1/32
5
acl localhost src 127.0.0.1/32
10
7
acl to_localhost dst 127.0.0.0/32
6
acl to_localhost dst 127.0.0.0/32
11
8
#
7
#
12
@@ -46,9 +45,6 @@
13
46
45
14
47
#Recommended minimum configuration:
46
#Recommended minimum configuration:
15
48
#
47
#
16
49
# Only allow cachemgr access from localhost
17
50
http_access allow manager localhost
18
51
http_access deny manager
19
52
# Only allow purge requests from localhost
48
# Only allow purge requests from localhost
20
53
http_access allow purge localhost
49
http_access allow purge localhost
21
54
http_access deny purge
50
http_access deny purge
22
55
51
23
=== modified file 'ubuntuone/devtools/services/squid.py'
24
--- ubuntuone/devtools/services/squid.py	2013-02-08 19:38:02 +0000
25
+++ ubuntuone/devtools/services/squid.py	2013-09-18 20:21:43 +0000
26
@@ -50,14 +50,15 @@
27
50
    get_arbitrary_port,
50
    get_arbitrary_port,
28
51
)
51
)
29
52
52
31
53
# pylint: disable=C0103
53
NCSA_BASIC_PREFIX = 'basic_'
32
54
if sys.platform == 'win32':
54
if sys.platform == 'win32':
34
55
    AUTH_PROCESS_PATH = r'C:\squid\libexec\ncsa_auth.exe'
55
    AUTH_PROCESS_PATH = 'C:\\squid\\libexec\\'
35
56
    AUTH_PROCESS_NAME = 'ncsa_auth.exe'
36
56
    SQUID_START_ARGS = ['-f']
57
    SQUID_START_ARGS = ['-f']
37
57
else:
58
else:
39
58
    AUTH_PROCESS_PATH = '/usr/lib/%s/ncsa_auth'
59
    AUTH_PROCESS_PATH = '/usr/lib/%s/'
40
60
    AUTH_PROCESS_NAME = 'ncsa_auth'
41
59
    SQUID_START_ARGS = ['-N', '-X', '-f']
61
    SQUID_START_ARGS = ['-N', '-X', '-f']
42
60
# pylint: enable=C0103
43
61
62
44
62
SQUID_CONFIG_FILE = 'squid.conf.in'
63
SQUID_CONFIG_FILE = 'squid.conf.in'
45
63
SQUID_DIR = 'squid'
64
SQUID_DIR = 'squid'
46
@@ -77,11 +78,16 @@
47
77
    if sys.platform == 'win32':
78
    if sys.platform == 'win32':
48
78
        path = find_executable('ncsa_auth')
79
        path = find_executable('ncsa_auth')
49
79
        if path is None:
80
        if path is None:
51
80
            path = AUTH_PROCESS_PATH
81
            path = AUTH_PROCESS_PATH + NCSA_BASIC_PREFIX + AUTH_PROCESS_NAME
52
82
            if not exists(path):
53
83
                path = AUTH_PROCESS_PATH + AUTH_PROCESS_NAME
54
81
        return format_config_path(path)
84
        return format_config_path(path)
55
82
    else:
85
    else:
56
83
        squid = 'squid3' if squid_version == 3 else 'squid'
86
        squid = 'squid3' if squid_version == 3 else 'squid'
58
84
        path = AUTH_PROCESS_PATH % squid
87
        auth_path = (AUTH_PROCESS_PATH % squid)
59
88
        path = auth_path + NCSA_BASIC_PREFIX + AUTH_PROCESS_NAME
60
89
        if not exists(path):
61
90
            path = auth_path + AUTH_PROCESS_NAME
62
85
        return path
91
        return path
63
86
92
64
87
93
65
88
94
66
=== modified file 'ubuntuone/devtools/services/tests/test_squid_linux.py'
67
--- ubuntuone/devtools/services/tests/test_squid_linux.py	2012-04-26 14:52:43 +0000
68
+++ ubuntuone/devtools/services/tests/test_squid_linux.py	2013-09-18 20:21:43 +0000
69
@@ -40,12 +40,12 @@
70
40
    def test_get_auth_process_3(self):
40
    def test_get_auth_process_3(self):
71
41
        """Test getting the auth process for squid3."""
41
        """Test getting the auth process for squid3."""
72
42
        expected = squid.AUTH_PROCESS_PATH % 'squid3'
42
        expected = squid.AUTH_PROCESS_PATH % 'squid3'
74
43
        self.assertEqual(expected, squid.get_auth_process_path(3))
43
        self.assertTrue(squid.get_auth_process_path(3).startswith(expected))
75
44
44
76
45
    def test_get_auth_process(self):
45
    def test_get_auth_process(self):
77
46
        """Test getting the auth process."""
46
        """Test getting the auth process."""
78
47
        expected = squid.AUTH_PROCESS_PATH % 'squid'
47
        expected = squid.AUTH_PROCESS_PATH % 'squid'
80
48
        self.assertEqual(expected, squid.get_auth_process_path(2))
48
        self.assertTrue(squid.get_auth_process_path(2).startswith(expected))
81
49
49
82
50
    def test_format_config_path(self):
50
    def test_format_config_path(self):
83
51
        """Test formating a config path."""
51
        """Test formating a config path."""
84
52
52
85
=== modified file 'ubuntuone/devtools/services/tests/test_squid_windows.py'
86
--- ubuntuone/devtools/services/tests/test_squid_windows.py	2012-04-26 14:52:43 +0000
87
+++ ubuntuone/devtools/services/tests/test_squid_windows.py	2013-09-18 20:21:43 +0000
88
@@ -52,9 +52,11 @@
89
52
            return path
52
            return path
90
53
53
91
54
        self.patch(squid, 'format_config_path', fake_format)
54
        self.patch(squid, 'format_config_path', fake_format)
95
55
        self.assertEqual(squid.AUTH_PROCESS_PATH,
55
        self.assertTrue(squid.get_auth_process_path(3).startswith(
96
56
                         squid.get_auth_process_path(3))
56
            squid.AUTH_PROCESS_PATH))
97
57
        self.assertIn(('format', squid.AUTH_PROCESS_PATH), called)
57
        self.assertIn(('format',
98
58
                       squid.AUTH_PROCESS_PATH + squid.AUTH_PROCESS_NAME),
99
59
                      called)
100
58
60
101
59
    def test_get_auth_process_path(self):
61
    def test_get_auth_process_path(self):
102
60
        """Test getting the auth process."""
62
        """Test getting the auth process."""
Status:	Merged
Approved by:	dobey on 2013-09-19
Approved revision:	107
Merged at revision:	106
Proposed branch:	lp:~dobey/ubuntuone-dev-tools/ncsa-changed
Merge into:	lp:ubuntuone-dev-tools
Diff against target:	102 lines (+19/-15) 4 files modified data/squid.conf.in (+0/-4) ubuntuone/devtools/services/squid.py (+12/-6) ubuntuone/devtools/services/tests/test_squid_linux.py (+2/-2) ubuntuone/devtools/services/tests/test_squid_windows.py (+5/-3)
To merge this branch:	bzr merge lp:~dobey/ubuntuone-dev-tools/ncsa-changed
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
Mike McCracken (community)		Approve on 2013-09-18
Roberto Alsina (community)	2013-09-18	Approve on 2013-09-18
Review via email: mp+186438@code.launchpad.net