diff options
author | Martin Pitt <martinpitt@gnome.org> | 2012-10-15 10:18:40 +0200 |
---|---|---|
committer | Martin Pitt <martinpitt@gnome.org> | 2012-10-15 10:33:24 +0200 |
commit | 4546505e171b5b57f0ffb3e5bf0420d3be7163ff (patch) | |
tree | bffc558507f686676e07922b47dfab554c69da08 | |
parent | 10e3705ed5f74840a5d7e13afa1df18f196becce (diff) | |
download | gvfs-4546505e171b5b57f0ffb3e5bf0420d3be7163ff.tar.gz |
gvfs-test: Ship static SSL certificate, drop openssl dependency
Stop generating an SSL certificate on the fly, it's too brittle across
different distributions and unnecessary overhead. Instead, ship a static test
SSL certificate.
https://bugzilla.gnome.org/show_bug.cgi?id=686006
-rw-r--r-- | test/files/testcert.pem | 29 | ||||
-rwxr-xr-x | test/gvfs-test | 17 |
2 files changed, 35 insertions, 11 deletions
diff --git a/test/files/testcert.pem b/test/files/testcert.pem new file mode 100644 index 00000000..d31e9636 --- /dev/null +++ b/test/files/testcert.pem @@ -0,0 +1,29 @@ +-----BEGIN PRIVATE KEY----- +MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAL5s/KxYPSz0AsQ2 +6nnS0m27cbIS3T4YqemMuNBElZ15jsV4xy0Lj2ahNctjQkTGB7ks2QOsS89GjLId +tOhwJXlf7odeL43ZnTIqKlrpdwW0kYo3crI4HHW/KNBLp7UxJMkOsomZN1+v3Mm0 +CXwmgeqfmFM1iku7n+PcxZSWA2WTAgMBAAECgYB9ppSjdCYJv4kDx+i4MfBAD+tZ +wTDThJq5TO22H0tJ+afHjYZ/pp0c70r7xac4kiMOgRVBYzMyti6oaQmyRi2y37gO +VD6otfZ60V4IR9VrVMGCZvgufn07oY0y2h+tlzo9c7CZs+kLBKN8iW2uLld4q/2E +vTfPRP1Ncw0NGzs1YQJBAPiV5wTjX8K2yweZDAvNg30LFPY13uJ4ly/uIqTZsAay +NujhPFNbfa7RBEWeUFgRfIdd+Ge0X738WYS7r7S56K8CQQDEGv/9J4rEhgW31rQD +ljb5VnDY/Bm95yd545UZkJLGtcsP4M3BWvo99W81YpPm19Iq8g5+Ai0Uy0izthFA +/4JdAkEAkpkMkYRpv9G+8C8gvIEpbv+vD/f7BoHpXznHsoIyXfCRk0rpIZuOBh97 +rnbLmPRPBSG00au83rTIMg/hcepFPwJBALj+v36RTtcVl09Vu3umuTV91fbb22zK +IvNZPc5gFBZgaK8R4wgESw0n+0DhPaUG87yPnBxC8UQsgOkHWD94ygECQQCEw9U5 +cID2DWwRhA3jXfst7p2x+/p6l1BklKato9lOMdU0+zcLYTHJY53TfApovBCfgrN1 +LWTGEj+Q2ENE8ZSL +-----END PRIVATE KEY----- +-----BEGIN CERTIFICATE----- +MIIB9jCCAV+gAwIBAgIJAOtEwzBD8neBMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV +BAMMCWxvY2FsaG9zdDAeFw0xMjEwMTUwODEzMDNaFw0yMjEwMTMwODEzMDNaMBQx +EjAQBgNVBAMMCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA +vmz8rFg9LPQCxDbqedLSbbtxshLdPhip6Yy40ESVnXmOxXjHLQuPZqE1y2NCRMYH +uSzZA6xLz0aMsh206HAleV/uh14vjdmdMioqWul3BbSRijdysjgcdb8o0EuntTEk +yQ6yiZk3X6/cybQJfCaB6p+YUzWKS7uf49zFlJYDZZMCAwEAAaNQME4wHQYDVR0O +BBYEFEdfmvvvFCeuS2RnbEaFR65NYAXaMB8GA1UdIwQYMBaAFEdfmvvvFCeuS2Rn +bEaFR65NYAXaMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAqBYJZ+LA +P3GjVP3HscoAJP0WK7ySVeW/+yTfsNhnw6YSVJm7+EGfh95yUAtLQj5wCtQaOGaV +ozIy3RVX4tBd/MKqlLWBl0ZRPrNjNaTrA8T8CkR949h1uSwiPuPNXPTFGft7foCp +2a0IELwN8JFrRPCHgiYWD+3joZgCf6v4xy4= +-----END CERTIFICATE----- diff --git a/test/gvfs-test b/test/gvfs-test index 7077ff56..91cd48e2 100755 --- a/test/gvfs-test +++ b/test/gvfs-test @@ -41,6 +41,8 @@ local_ip = subprocess.check_output("ip -4 addr | sed -nr '/127\.0\.0/ n; " "/inet / { s/^.*inet ([0-9.]+).*$/\\1/; p; q }'", shell=True, universal_newlines=True) +my_dir = os.path.dirname(os.path.abspath(__file__)) + # http://sg.danny.cz/sg/sdebug26.html PTYPE_DISK = 0 PTYPE_CDROM = 5 @@ -801,14 +803,6 @@ class Dav(GvfsTestCase): klass.mod_dir = klass.get_httpd_module_dir() klass.httpd_sandbox = tempfile.mkdtemp() - # create SSL certificate - openssl = subprocess.check_call(['openssl', 'req', '-x509', '-nodes', - '-days', '1', '-newkey', 'rsa:1024', '-subj', - '/CN=localhost', '-keyout', 'mycert.pem', - '-out', 'mycert.pem'], - stderr=subprocess.PIPE, - cwd=klass.httpd_sandbox) - klass.public_dir = os.path.join(klass.httpd_sandbox, 'public') os.mkdir(klass.public_dir) with open(os.path.join(klass.public_dir, 'hello.txt'), 'w') as f: @@ -844,8 +838,8 @@ DAVLockDB DAVLock <VirtualHost localhost:4443> SSLEngine on - SSLCertificateFile mycert.pem - SSLCertificateKeyFile mycert.pem + SSLCertificateFile %(mydir)s/files/testcert.pem + SSLCertificateKeyFile %(mydir)s/files/testcert.pem </VirtualHost> <Directory %(root)s/public> @@ -861,7 +855,8 @@ DAVLockDB DAVLock </Directory> ''' % {'mod_dir': klass.mod_dir, 'root': klass.httpd_sandbox, - 'modules': modules}) + 'modules': modules, + 'mydir': my_dir}) # start server try: |