Ubuntu One Client

Merge lp:~alecu/ubuntuone-client/validate-ssl-cert-3-0 into lp:ubuntuone-client/stable-3-0

  1. validate-ssl-cert-3-0
  2. Merge into stable-3-0
Proposed by Alejandro J. Cura
Status: Merged
Approved by: dobey
Approved revision: 1191
Merged at revision: 1191
Proposed branch: lp:~alecu/ubuntuone-client/validate-ssl-cert-3-0
Merge into: lp:ubuntuone-client/stable-3-0
Diff against target: 25 lines (+2/-2)
2 files modified
data/syncdaemon.conf (+1/-1)
ubuntuone/syncdaemon/action_queue.py (+1/-1)
To merge this branch: bzr merge lp:~alecu/ubuntuone-client/validate-ssl-cert-3-0
Reviewer Review Type Date Requested Status
dobey (community) Approve
Review via email: mp+109032@code.launchpad.net

Commit message

- Validate SSL certificates (LP: #882062).

Description of the change

This branch depends on lp:~alecu/ubuntuone-storage-protocol/validate-ssl-cert

To post a comment you must log in.
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :

Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0, Needs Fixing == 0, Needs Information == 0, Resubmit == 0, Pending == 0. Got: 1 Pending.

Revision history for this message
dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/syncdaemon.conf'
2--- data/syncdaemon.conf 2012-03-05 13:37:12 +0000
3+++ data/syncdaemon.conf 2012-06-06 20:58:18 +0000
4@@ -2,7 +2,7 @@
5 host.default = fs-1.one.ubuntu.com
6 host.help = The server address
7
8-dns_srv.default = _https._tcp.fs.ubuntuone.com
9+dns_srv.default = _https._tcp.fs.one.ubuntu.com
10 dns_srv.help = The DNS SRV record
11
12 disable_ssl_verify.default = False
13
14=== modified file 'ubuntuone/syncdaemon/action_queue.py'
15--- ubuntuone/syncdaemon/action_queue.py 2012-05-16 22:01:56 +0000
16+++ ubuntuone/syncdaemon/action_queue.py 2012-06-06 20:58:18 +0000
17@@ -855,7 +855,7 @@
18 def _make_connection(self, result):
19 """Do the real connect call."""
20 host, port = result
21- ssl_context = get_ssl_context(self.disable_ssl_verify)
22+ ssl_context = get_ssl_context(self.disable_ssl_verify, host)
23 client = yield self.tunnel_runner.get_client()
24 if self.use_ssl:
25 self.connector = client.connectSSL(host, port, factory=self,

Subscribers

People subscribed via source and target branches