← Back to branch summary

~ubuntu-branches/ubuntu/precise/maas/precise-security

« back to all changes in this revision

Viewing changes to twisted/plugins/maasps.py

Tags: 1.2+bzr1373+dfsg-0ubuntu1~12.04.4
https://launchpad.net/bugs/1039513
https://launchpad.net/bugs/1158425
* SECURITY UPDATE: failure to authenticate downloaded content (LP: #1039513)
  - debian/patches/CVE-2013-1058.patch: Authenticate downloaded files with
    GnuPG and MD5SUM files. Thanks to Julian Edwards.
  - CVE-2013-1058
* SECURITY UPDATE: configuration options may be loaded from current working
  directory (LP: #1158425)
  - debian/patches/CVE-2013-1057-1-2.patch: Do not load configuration
    options from the current working directory. Thanks to Julian Edwards.
  - CVE-2013-1057

Show diffs side-by-side

added added

removed removed

Lines of Context:
twisted/plugins/maasps.py
13
13
__all__ = []
14
14
 
15
15
 
16
 
from provisioningserver.plugin import ProvisioningServiceMaker
17
 
 
18
 
# Construct objects which *provide* the relevant interfaces. The name of
19
 
# these variables is irrelevant, as long as there are *some* names bound
20
 
# to providers of IPlugin and IServiceMaker.
21
 
 
22
 
service = ProvisioningServiceMaker("maas-pserv", "...")  # TODO: finish
 
16
try:
 
17
    from provisioningserver.plugin import ProvisioningServiceMaker
 
18
except ImportError:
 
19
    pass  # Ignore.
 
20
else:
 
21
    # Construct objects which *provide* the relevant interfaces. The name of
 
22
    # these variables is irrelevant, as long as there are *some* names bound
 
23
    # to providers of IPlugin and IServiceMaker.
 
24
    service = ProvisioningServiceMaker("maas-pserv", "...")  # TODO: finish