Merge branch 'master' of github.com:celery/celery

celery/tests/security/__init__.py

@@ -1,19 +1,25 @@
 from __future__ import absolute_import
+"""
+Keys and certificates for tests (KEY1 is a private key of CERT1, etc.)
+
+Generated with `extra/security/get-cert.sh`
+
+"""
 
 KEY1 = """-----BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQDCsmLC+eqL4z6bhtv0nzbcnNXuQrZUoh827jGfDI3kxNZ2LbEy
-kJOn7GIl2tPpcY2Dm1sOM8G1XLm/8Izprp4ifpF4Gi0mqz0GquY5dcMNASG9zkRO
-J1z8dQUyp3PIUHdQdrKbYQVifkA4dh6Kg27k8/IcdY1lHsaIju4bX7MADwIDAQAB
-AoGBAKWpCRWjdiluwu+skO0Up6aRIAop42AhzfN8OuZ81SMJRP2rJTHECI8COATD
-rDneb63Ce3ibG0BI1Jf3gr624D806xVqK/SVHZNbfWx0daE3Q43DDk1UdhRF5+0X
-HPqqU/IdeW1YGyWJi+IhMTXyGqhZ1BTN+4vHL7NlRpDt6JOpAkEA+xvfRO4Ca7Lw
-NEgvW7n+/L9b+xygQBtOA5s260pO+8jMrXvOdCjISaKHD8HZGFN9oUmLsDXXBhjh
-j0WCMdsHbQJBAMZ9OIw6M/Uxv5ANPCD58p6PZTb0knXVPMYBFQ7Y/h2HZzqbEyiI
-DLGZpAa9/IhVkoCULd/TNytz5rl27KEni+sCQArFQEdZmhr6etkTO4zIpoo6vvw/
-VxRI14jKEIn5Dvg3vae3RryuvyCBax+e5evoMNxJJkexl354dLxLc/ElfuUCQQCq
-U14pBvD7ITuPM6w7aAEIi2iBZhIgR2GlT9xwJ0i4si6lHdms2EJ8TKlyl6mSnEvh
-RkavYSJgiU6eLC0WhUcNAkEA7vuNcz/uuckmq870qfSzUQJIYLzwVOadEdEEAVy0
-L0usztlKmAH8U/ceQMMJLMI9W4m680JrMf3iS7f+SkgUTA==
+MIICXQIBAAKBgQC0mh1hT29EBdN9zxUGaKKx+e0CxGdwv3GonjV+s+mkCuhfWRFu
+0Y2P74fFTju7dr97qYGm6ehZl4shJcHVYMayn5SsR35cdieCvBZMDIg3I/jVj1e4
+6ZB3JJ1BMiDzvI4h2zrZfzOI7+xmIimMiuR8Yasa+LqatuCcodRp49cj9wIDAQAB
+AoGBAJ2IqQQO1BFTu61MCxzx/KieRv1Y8JnKhIv+pM8GhFCRKyywdqJhq8fXumiC
+21ukM1bc/rjn48Lyi2u4kaFcrzP8n/gx33qWJtGvuYnT2OsRRglk9yMPrSDoCGxR
+jCEJ+bGjqh2FIVfXfIAOX4VrDK4SX1vCpmBXuc4at4kiFykhAkEA4kLtq+1X2ZxO
+cq5ItSADJp799TgPiPRWI0/uI0ZCjD/JXpOZrpcfqL1YdvL64MOyraZ+WjVG6NuH
+Ot8XAMI5iQJBAMxW33XaR3ITR3W8H9WboqvxCB+JEa39+YUrcyqwTIujzNVEzfJq
+3DhuXjfwBUVXcZFZtvNvgVRdYp8m9e42kX8CQEpJKRlSgo5ayFLUr+Bv0zkB6GVz
+c35GomVTn98K+VxssOORWFq/GVDgYcQkAIR9HBPxXvilF1Pqh5qnljjUi+kCQCAK
++226tftwhIM05fUUO9UkrfZsAya6rfcxEhU+ojI/lG5ZJMZ/9VqwC/xPmjP+e2Ok
+oujXsnstTbrRXD1ntzcCQQCZYqfSq+LsioR1Oj4xfL6ggLvVPMh1LQMVN0xrJSGh
+6swreoj1e80KZbeKF4CbsTFGM9omv9suZy6nIX42IPbT
 -----END RSA PRIVATE KEY-----"""
 
 KEY2 = """-----BEGIN RSA PRIVATE KEY-----
@@ -33,17 +39,18 @@ Fxeq/HOp9JYw4gRu6Ycvqu57KHwpHhR0FCXRBxuYcJ5V
 -----END RSA PRIVATE KEY-----"""
 
 CERT1 = """-----BEGIN CERTIFICATE-----
-MIICATCCAWoCCQCR6B3XQcBOvjANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJB
-VTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0
-cyBQdHkgTHRkMB4XDTExMDcxOTA5MDgyMloXDTEyMDcxODA5MDgyMlowRTELMAkG
-A1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0
-IFdpZGdpdHMgUHR5IEx0ZDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwrJi
-wvnqi+M+m4bb9J823JzV7kK2VKIfNu4xnwyN5MTWdi2xMpCTp+xiJdrT6XGNg5tb
-DjPBtVy5v/CM6a6eIn6ReBotJqs9BqrmOXXDDQEhvc5ETidc/HUFMqdzyFB3UHay
-m2EFYn5AOHYeioNu5PPyHHWNZR7GiI7uG1+zAA8CAwEAATANBgkqhkiG9w0BAQUF
-AAOBgQA4+OiJ+pyq9lbEMFYC9K2+e77noHJkwUOs4wO6p1R14ZqSmoIszQ7KEBiH
-2HHPMUY6kt4GL1aX4Vr1pUlXXdH5WaEk0fvDYZemILDMqIQJ9ettx8KihZjFGC4k
-Y4Sy5xmqdE9Kjjd854gTRRnzpMnJp6+74Ki2X8GHxn3YBM+9Ng==
+MIICITCCAYoCCQDpOANMX9NJMTANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJB
+VTETMBEGA1UECAwKU29tZS1TdGF0ZTEPMA0GA1UECgwGQ2VsZXJ5MQ8wDQYDVQQL
+DAZDZWxlcnkxDzANBgNVBAMMBkNlbGVyeTAeFw0xMjA3MjAxMzQ1MDJaFw0xMzA3
+MjAxMzQ1MDJaMFUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMQ8w
+DQYDVQQKDAZDZWxlcnkxDzANBgNVBAsMBkNlbGVyeTEPMA0GA1UEAwwGQ2VsZXJ5
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC0mh1hT29EBdN9zxUGaKKx+e0C
+xGdwv3GonjV+s+mkCuhfWRFu0Y2P74fFTju7dr97qYGm6ehZl4shJcHVYMayn5Ss
+R35cdieCvBZMDIg3I/jVj1e46ZB3JJ1BMiDzvI4h2zrZfzOI7+xmIimMiuR8Yasa
++LqatuCcodRp49cj9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAHHi6qyPAKq85WIP
+SGW6f6TNOXhedo45l1Pnxh7clqOmASFWGQDntO9pZbhGMZPYZjrxVhTcxTIePTdN
+s+A0TGubHL1aDNAVcsIwheqmPnkIM1DiM8gJX9ITLPrzb1fBlxTl28urg/2FMsyF
+v6LeCcXGshzQNSFcVgfoLqXIh0Nv
 -----END CERTIFICATE-----"""
 
 CERT2 = """-----BEGIN CERTIFICATE-----

extra/security/gen-cert.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# Script for generating key-cert pairs
+#
+
+if [[ $# -ne 2 ]]; then
+  echo "Usage: ${0##*/} KEY CERT"
+  exit
+fi
+
+KEY=$1
+CERT=$2
+PSWD=test
+
+read -s -p "Enter Password: " $PSWD
+
+openssl genrsa -des3 -passout pass:$PSWD -out $KEY.key 1024
+openssl req -new -key $KEY.key -out $KEY.csr -passin pass:$PSWD
+cp $KEY.key $KEY.key.org
+openssl rsa -in $KEY.key.org -out $KEY.key -passin pass:$PSWD
+openssl x509 -req -days 365 -in $KEY.csr -signkey $KEY.key -out $CERT.crt
+rm $KEY.key.org $KEY.csr