Changeset 8101


Ignore:
Timestamp:
21/08/12 17:15:26 (7 years ago)
Author:
pjkersha
Message:
  • cleaned up myproxy.server.wsgi.middleware - refactored removing code previously for web service - this is moved into myproxy.ws.server.wsgi.middleware
  • fixed unittests and updated PKI files.
Location:
trunk/MyProxyWebService/myproxy
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/MyProxyWebService/myproxy/server/wsgi/middleware.py

    r8014 r8101  
    1212import logging 
    1313log = logging.getLogger(__name__) 
    14 import traceback 
    15 import socket 
    1614import httplib 
    17 import re 
    18  
    19 from OpenSSL import crypto 
    20  
    21 from myproxy.client import MyProxyClient, MyProxyClientError 
     15 
     16from myproxy.client import MyProxyClient 
    2217   
    2318 
     
    133128    @type __myProxyClient: myproxy.client.MyProxyClient 
    134129    ''' 
    135     # Options for ini file 
    136     LOGON_FUNC_ENV_KEYNAME_OPTNAME = 'logonFuncEnvKeyName'      
    137      
    138     # Default environ key names 
    139     DEFAULT_LOGON_FUNC_ENV_KEYNAME = ('myproxy.server.wsgi.middleware.' 
    140                                       'MyProxyClientMiddleware.logon') 
    141      
    142     CERT_REQ_POST_PARAM_KEYNAME = 'certificate_request' 
    143      
    144130    # Option prefixes 
    145131    PARAM_PREFIX = 'myproxy.' 
  • trunk/MyProxyWebService/myproxy/ws/server/wsgi/middleware.py

    r8085 r8101  
    1818import traceback 
    1919 
     20from webob import Request 
    2021from OpenSSL import crypto 
    2122 
  • trunk/MyProxyWebService/myproxy/ws/test/localhost.crt

    r6997 r8101  
    1 Certificate: 
    2     Data: 
    3         Version: 3 (0x2) 
    4         Serial Number: 2 (0x2) 
    5         Signature Algorithm: md5WithRSAEncryption 
    6         Issuer: O=NDG, OU=Security, CN=Test CA 
    7         Validity 
    8             Not Before: Jun 11 09:04:56 2010 GMT 
    9             Not After : Jun 11 09:04:56 2011 GMT 
    10         Subject: O=NDG, OU=Security, CN=localhost 
    11         Subject Public Key Info: 
    12             Public Key Algorithm: rsaEncryption 
    13             RSA Public Key: (2048 bit) 
    14                 Modulus (2048 bit): 
    15                     00:c0:e0:94:c2:e9:c0:df:96:36:ba:4d:0e:3f:bc: 
    16                     41:51:7b:4f:fe:d8:82:47:52:f8:36:57:35:15:3b: 
    17                     83:77:ba:84:aa:a3:48:f0:03:0b:5a:b7:31:40:8d: 
    18                     3f:87:05:9e:06:c6:72:1f:ca:7d:ed:73:3c:d0:76: 
    19                     4d:3b:32:89:e7:1f:5b:84:27:bf:8b:72:09:2a:d4: 
    20                     40:8d:2c:c4:c3:23:68:6c:f4:62:55:a8:e0:2e:8a: 
    21                     c8:b4:5f:bf:e1:18:d7:6a:a6:1a:90:6d:e6:83:17: 
    22                     10:3a:95:b5:da:0d:44:3f:df:fb:6c:c5:9e:bf:1d: 
    23                     04:5f:1c:16:ce:9e:f7:9d:81:f8:fe:ca:43:82:5f: 
    24                     6b:c8:70:17:f8:e8:f3:74:d9:fb:ac:14:af:99:8f: 
    25                     fd:f3:ad:e2:7e:8d:f3:bd:89:15:f0:39:ea:51:7c: 
    26                     29:81:8c:bc:ba:63:6b:69:e0:c1:46:2f:27:93:83: 
    27                     85:be:8b:bb:aa:b8:76:c3:ec:8a:f6:50:e1:c3:90: 
    28                     9e:47:1d:19:68:40:62:59:13:8b:eb:e8:89:64:20: 
    29                     ec:a3:b7:e7:b2:8f:98:f2:64:b4:aa:6e:d0:f1:73: 
    30                     fc:ea:ed:19:19:67:98:11:f5:95:ca:76:0b:c7:43: 
    31                     35:3c:53:23:b5:67:b0:b5:26:59:d1:c5:3e:4a:d1: 
    32                     70:dd 
    33                 Exponent: 65537 (0x10001) 
    34         X509v3 extensions: 
    35             Netscape Cert Type:  
    36                 SSL Client, SSL Server, S/MIME, Object Signing 
    37     Signature Algorithm: md5WithRSAEncryption 
    38         70:9e:28:be:0e:7e:b2:af:0b:95:e9:60:ea:1b:51:bc:02:76: 
    39         f3:67:69:47:ba:99:a1:4e:0f:2f:cb:2c:e8:ac:0e:20:b8:dd: 
    40         e0:70:9f:d0:5b:a6:5f:cd:42:3f:a6:aa:98:ef:f8:39:4a:ac: 
    41         79:8d:71:79:a4:98:19:00:e4:87:34:e6:c4:f6:8d:b5:d2:c3: 
    42         cf:45:77:e7:54:c9:3a:81:b6:47:da:ce:71:ba:79:4c:e2:d5: 
    43         40:44:b1:55:b6:a7:7b:57:31:43:fb:8c:58:f3:83:d3:68:e2: 
    44         5c:a4:30:2c:cc:c2:b0:e5:3f:84:18:2b:34:f6:39:50:a0:61: 
    45         13:28 
    461-----BEGIN CERTIFICATE----- 
    47 MIICdzCCAeCgAwIBAgIBAjANBgkqhkiG9w0BAQQFADAzMQwwCgYDVQQKEwNOREcx 
    48 ETAPBgNVBAsTCFNlY3VyaXR5MRAwDgYDVQQDEwdUZXN0IENBMB4XDTEwMDYxMTA5 
    49 MDQ1NloXDTExMDYxMTA5MDQ1NlowNTEMMAoGA1UEChMDTkRHMREwDwYDVQQLEwhT 
    50 ZWN1cml0eTESMBAGA1UEAxMJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOC 
    51 AQ8AMIIBCgKCAQEAwOCUwunA35Y2uk0OP7xBUXtP/tiCR1L4Nlc1FTuDd7qEqqNI 
    52 8AMLWrcxQI0/hwWeBsZyH8p97XM80HZNOzKJ5x9bhCe/i3IJKtRAjSzEwyNobPRi 
    53 VajgLorItF+/4RjXaqYakG3mgxcQOpW12g1EP9/7bMWevx0EXxwWzp73nYH4/spD 
    54 gl9ryHAX+OjzdNn7rBSvmY/9863ifo3zvYkV8DnqUXwpgYy8umNraeDBRi8nk4OF 
    55 vou7qrh2w+yK9lDhw5CeRx0ZaEBiWROL6+iJZCDso7fnso+Y8mS0qm7Q8XP86u0Z 
    56 GWeYEfWVynYLx0M1PFMjtWewtSZZ0cU+StFw3QIDAQABoxUwEzARBglghkgBhvhC 
    57 AQEEBAMCBPAwDQYJKoZIhvcNAQEEBQADgYEAcJ4ovg5+sq8Llelg6htRvAJ282dp 
    58 R7qZoU4PL8ss6KwOILjd4HCf0FumX81CP6aqmO/4OUqseY1xeaSYGQDkhzTmxPaN 
    59 tdLDz0V351TJOoG2R9rOcbp5TOLVQESxVbane1cxQ/uMWPOD02jiXKQwLMzCsOU/ 
    60 hBgrNPY5UKBhEyg= 
     2MIICFjCCAX+gAwIBAgIBCjANBgkqhkiG9w0BAQQFADAzMQwwCgYDVQQKEwNOREcx 
     3ETAPBgNVBAsTCFNlY3VyaXR5MRAwDgYDVQQDEwdUZXN0IENBMB4XDTEyMDIwODE2 
     4MTE1M1oXDTE3MDIwNjE2MTE1M1owNTERMA8GA1UECxMIU2VjdXJpdHkxEjAQBgNV 
     5BAMTCWxvY2FsaG9zdDEMMAoGA1UEChMDTkRHMIGfMA0GCSqGSIb3DQEBAQUAA4GN 
     6ADCBiQKBgQCdhZgzD0xusZqzdphETJPgb4QK/sdDpF8EOT/20bAuyRgGt7papJmc 
     76UtdgS5b9bGh6sRXx+vSKiTqq1ZFLOjnn3OQKhdrK2VU8XiD5rjuwTuNzser0uba 
     8lTOW5/2yVab+uZ/vw4yxR64+KdyBuVopXV9STuh12Q0JSrXzdH82iQIDAQABozgw 
     9NjAMBgNVHRMBAf8EAjAAMCYGA1UdEQQfMB2CCWxvY2FsaG9zdIIQbG9jYWxob3N0 
     10LmRvbWFpbjANBgkqhkiG9w0BAQQFAAOBgQBAAQCTkLfgYAjvm63KRXcE8djkYIVQ 
     11LleHNrCad/v3zNFK0PPCjIeBSWlI/1bPhJDCpfwpvJLk86DrB97Q3IafU2ml7DkC 
     1293bi3iaDy4jI1uskvlM516iaBQx1DCIa4gesluBAnZFvby8HX9y/A7tn5Ew2vdQJ 
     13upkcCUswsU4MSA== 
    6114-----END CERTIFICATE----- 
  • trunk/MyProxyWebService/myproxy/ws/test/localhost.key

    r6997 r8101  
    11-----BEGIN RSA PRIVATE KEY----- 
    2 MIIEowIBAAKCAQEAwOCUwunA35Y2uk0OP7xBUXtP/tiCR1L4Nlc1FTuDd7qEqqNI 
    3 8AMLWrcxQI0/hwWeBsZyH8p97XM80HZNOzKJ5x9bhCe/i3IJKtRAjSzEwyNobPRi 
    4 VajgLorItF+/4RjXaqYakG3mgxcQOpW12g1EP9/7bMWevx0EXxwWzp73nYH4/spD 
    5 gl9ryHAX+OjzdNn7rBSvmY/9863ifo3zvYkV8DnqUXwpgYy8umNraeDBRi8nk4OF 
    6 vou7qrh2w+yK9lDhw5CeRx0ZaEBiWROL6+iJZCDso7fnso+Y8mS0qm7Q8XP86u0Z 
    7 GWeYEfWVynYLx0M1PFMjtWewtSZZ0cU+StFw3QIDAQABAoIBABL7h2iPfO4EaKp5 
    8 PvfC3WLZkgvw3xGJ9ufSOWU3kD7OWpQ4scr9Ybax5OUHgcMWKHFeQokicrZV6xxR 
    9 KFS1KqFWkrk0+EMPHBvc++VpDIxwBa0DeFIZ5sZt3kbyTX4n5buXUXH5fwBT2sMJ 
    10 TPaC676lmqcf4/nHL1D1AMGhH5merxGFGBapMLaMYQDP0dFF6av1q11IAtT8CWjt 
    11 dTJhKsRwoPkkjjDLvVdGXuud+CE8fFUJwS73OacXxqG2CHAjUkDM89QQtHsb/Wfo 
    12 crF6JfH2vErBoTw4LVyJ8qeUGmkvRoInmJd+M/MT0fMtOLJe8Sj8h3LAvfGxtke2 
    13 a6j/sLkCgYEA+IAvE8reQ+3yroIGKees1S2+b0qqi0vKYjqD+qdpawc+GwbuMtHc 
    14 4fOo9VqjknLJwgpZDu6H5+8s+XJLGJbz8H3N9dgVhGsBd4KwNeVB//oKC5aNYQc7 
    15 oDYbpHqGFA1f+bQa1qPd2AF00jXqU+Lk1/l3z87hK3sLcrAWG5Dms+MCgYEAxrKs 
    16 RMMfYnI4hy9Aqy9cL2OcsB3dRGrPo/LMhy7L4Fkr25qq4mQKa+v4DVulf4HZOpw2 
    17 rghHbyVNL/GiUGQiqYIe31L8w8BXviaRReoy+47lBLaQ2NVX4Lv+y7N9p6U4xxEc 
    18 m+CCtSN74YvYzRpIKBRaPSWf+UNTqRRSDEjn5D8CgYEAu9YYv7s+2tYH9MSv6AkI 
    19 6XLUWcd0tiop5qoYjOTymEY3ObK5Zoyfi+PkOOG0dsRxoUy1GMZQ0I5Hzp4ICaRA 
    20 6+4MOuKFETzZNP8CNxr+EoFsCmpYn5kaBvYfWuqKYqnhfBwZlVj0HYysQyEh6Rq+ 
    21 pEobuGbGaVluw9g6Pcf/usUCgYAv6k5YlqUu3FR9ZQu3PEiCtQbIAaumIAvKgXaI 
    22 8uP/SgGlh3rF9VH+DH1Y20zhnrJ/y8Pz29M+HkSq1x5JPJyPO+2t9Rk3K179X9eQ 
    23 gJWizCa2KEBtyaTTcQJUpQgcMV+rwZigjld2zwPEtDCn5TqZT68jJ7uYJIA8OcY/ 
    24 aCVjiQKBgFSIhub8r68DnC/UQUh2ktTTB+0VbqMxPWVohs9PJPE2fInUcei1KPHL 
    25 MceNKch+bfbJr64Ru3JKgqFQKsmhVGzLQXX49qDRHT30yGKpcGw2b6H4DUB2FR9L 
    26 6tVZKWeKspmaMGrdDs5/XuK4soE60oPO0nUiB7Sh70shN9/lWAfw 
     2MIICWwIBAAKBgQCdhZgzD0xusZqzdphETJPgb4QK/sdDpF8EOT/20bAuyRgGt7pa 
     3pJmc6UtdgS5b9bGh6sRXx+vSKiTqq1ZFLOjnn3OQKhdrK2VU8XiD5rjuwTuNzser 
     40ubalTOW5/2yVab+uZ/vw4yxR64+KdyBuVopXV9STuh12Q0JSrXzdH82iQIDAQAB 
     5AoGAejr+HTDT2FlMd9Gg2e6qGM+voHCO4vgbGsXp0nZnxgYY9K2Al3F+GXoWFxp0 
     6hLsj+UaY0Jy7art1JfuJ1+e/WTR+0s4c6IbZCy0fHF4i29wUI5lc0zSmtePgITOD 
     7tvgtJ8ji+ESq7sRyXO0Eb8wFJPyLj3efoeBQUl8Om1XMYGECQQDLayMY8dgqZCMK 
     8iRU0wrCgzu/1tNBv1hRwip+rOTiqqL+MAKSYg1XtWSlm2RojiNmBfvPo+7VrXZMu 
     9Nt1cBoOtAkEAxj1TuJRmZMf1QFuvv6DLloMmhilGkFobWysUZW18J8FyM+vI5kvH 
     10TjRp2ZGkSw7Fsl+MUpQdfNOkd7pilJd5zQJAPofWqCpf2tghdXGiVS+sACLc3NkS 
     11Ye6bJeVXI9lZNAzfpPfloQRue6G2+miuglHlGsudyvblU/XV8pTnAwz1mQJACyu3 
     12hQYvwuwVoNvJyoWYE1IuoI7A4C+DrR5/VrvVrDPVaKGXv4pzn6+Ka20ukeAyObvy 
     13n1CjXL5cXTbOiUsD3QJAPe8Rw/Nu3o76tZfWB3irvjZ/mUDPhEppSis5oJY/exoB 
     14O96/99UXZNwSbDII0gjBPN2pd2kf/Ik3EQlxiryZuw== 
    2715-----END RSA PRIVATE KEY----- 
  • trunk/MyProxyWebService/myproxy/ws/test/localhost.pem

    r8085 r8101  
    1 Certificate: 
    2     Data: 
    3         Version: 3 (0x2) 
    4         Serial Number: 40 (0x28) 
    5         Signature Algorithm: md5WithRSAEncryption 
    6         Issuer: O=NDG, OU=Security, CN=Test CA 
    7         Validity 
    8             Not Before: Jul  6 11:32:04 2011 GMT 
    9             Not After : Jul  5 11:32:04 2012 GMT 
    10         Subject: O=NDG, OU=Security, CN=localhost 
    11         Subject Public Key Info: 
    12             Public Key Algorithm: rsaEncryption 
    13             RSA Public Key: (2048 bit) 
    14                 Modulus (2048 bit): 
    15                     00:c0:e0:94:c2:e9:c0:df:96:36:ba:4d:0e:3f:bc: 
    16                     41:51:7b:4f:fe:d8:82:47:52:f8:36:57:35:15:3b: 
    17                     83:77:ba:84:aa:a3:48:f0:03:0b:5a:b7:31:40:8d: 
    18                     3f:87:05:9e:06:c6:72:1f:ca:7d:ed:73:3c:d0:76: 
    19                     4d:3b:32:89:e7:1f:5b:84:27:bf:8b:72:09:2a:d4: 
    20                     40:8d:2c:c4:c3:23:68:6c:f4:62:55:a8:e0:2e:8a: 
    21                     c8:b4:5f:bf:e1:18:d7:6a:a6:1a:90:6d:e6:83:17: 
    22                     10:3a:95:b5:da:0d:44:3f:df:fb:6c:c5:9e:bf:1d: 
    23                     04:5f:1c:16:ce:9e:f7:9d:81:f8:fe:ca:43:82:5f: 
    24                     6b:c8:70:17:f8:e8:f3:74:d9:fb:ac:14:af:99:8f: 
    25                     fd:f3:ad:e2:7e:8d:f3:bd:89:15:f0:39:ea:51:7c: 
    26                     29:81:8c:bc:ba:63:6b:69:e0:c1:46:2f:27:93:83: 
    27                     85:be:8b:bb:aa:b8:76:c3:ec:8a:f6:50:e1:c3:90: 
    28                     9e:47:1d:19:68:40:62:59:13:8b:eb:e8:89:64:20: 
    29                     ec:a3:b7:e7:b2:8f:98:f2:64:b4:aa:6e:d0:f1:73: 
    30                     fc:ea:ed:19:19:67:98:11:f5:95:ca:76:0b:c7:43: 
    31                     35:3c:53:23:b5:67:b0:b5:26:59:d1:c5:3e:4a:d1: 
    32                     70:dd 
    33                 Exponent: 65537 (0x10001) 
    34         X509v3 extensions: 
    35             Netscape Cert Type:  
    36                 SSL Client, SSL Server, S/MIME, Object Signing 
    37     Signature Algorithm: md5WithRSAEncryption 
    38         5a:2d:a4:5d:b2:b6:37:60:ed:16:62:88:a7:26:b7:d6:10:b4: 
    39         d0:f1:25:08:5f:b3:54:34:14:1b:3e:4e:b7:17:a5:6e:54:42: 
    40         a0:99:0b:41:ad:dc:e9:59:0f:c1:19:db:54:ba:a8:c8:09:44: 
    41         43:37:62:f9:59:7f:6a:e6:ff:db:4c:7c:68:d5:e8:0d:2f:58: 
    42         a9:64:a6:57:82:45:d1:41:a9:38:cb:29:70:13:eb:ac:1f:1a: 
    43         46:b6:b4:bb:a0:ed:0d:12:7c:3e:10:21:a3:62:1d:e2:ec:9c: 
    44         3a:a0:ca:ce:d2:ed:4a:61:14:19:c2:b5:bd:b6:4d:29:cd:3d: 
    45         8d:18 
    461-----BEGIN CERTIFICATE----- 
    47 MIICdzCCAeCgAwIBAgIBKDANBgkqhkiG9w0BAQQFADAzMQwwCgYDVQQKEwNOREcx 
    48 ETAPBgNVBAsTCFNlY3VyaXR5MRAwDgYDVQQDEwdUZXN0IENBMB4XDTExMDcwNjEx 
    49 MzIwNFoXDTEyMDcwNTExMzIwNFowNTEMMAoGA1UEChMDTkRHMREwDwYDVQQLEwhT 
    50 ZWN1cml0eTESMBAGA1UEAxMJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOC 
    51 AQ8AMIIBCgKCAQEAwOCUwunA35Y2uk0OP7xBUXtP/tiCR1L4Nlc1FTuDd7qEqqNI 
    52 8AMLWrcxQI0/hwWeBsZyH8p97XM80HZNOzKJ5x9bhCe/i3IJKtRAjSzEwyNobPRi 
    53 VajgLorItF+/4RjXaqYakG3mgxcQOpW12g1EP9/7bMWevx0EXxwWzp73nYH4/spD 
    54 gl9ryHAX+OjzdNn7rBSvmY/9863ifo3zvYkV8DnqUXwpgYy8umNraeDBRi8nk4OF 
    55 vou7qrh2w+yK9lDhw5CeRx0ZaEBiWROL6+iJZCDso7fnso+Y8mS0qm7Q8XP86u0Z 
    56 GWeYEfWVynYLx0M1PFMjtWewtSZZ0cU+StFw3QIDAQABoxUwEzARBglghkgBhvhC 
    57 AQEEBAMCBPAwDQYJKoZIhvcNAQEEBQADgYEAWi2kXbK2N2DtFmKIpya31hC00PEl 
    58 CF+zVDQUGz5OtxelblRCoJkLQa3c6VkPwRnbVLqoyAlEQzdi+Vl/aub/20x8aNXo 
    59 DS9YqWSmV4JF0UGpOMspcBPrrB8aRra0u6DtDRJ8PhAho2Id4uycOqDKztLtSmEU 
    60 GcK1vbZNKc09jRg= 
     2MIICFjCCAX+gAwIBAgIBCjANBgkqhkiG9w0BAQQFADAzMQwwCgYDVQQKEwNOREcx 
     3ETAPBgNVBAsTCFNlY3VyaXR5MRAwDgYDVQQDEwdUZXN0IENBMB4XDTEyMDIwODE2 
     4MTE1M1oXDTE3MDIwNjE2MTE1M1owNTERMA8GA1UECxMIU2VjdXJpdHkxEjAQBgNV 
     5BAMTCWxvY2FsaG9zdDEMMAoGA1UEChMDTkRHMIGfMA0GCSqGSIb3DQEBAQUAA4GN 
     6ADCBiQKBgQCdhZgzD0xusZqzdphETJPgb4QK/sdDpF8EOT/20bAuyRgGt7papJmc 
     76UtdgS5b9bGh6sRXx+vSKiTqq1ZFLOjnn3OQKhdrK2VU8XiD5rjuwTuNzser0uba 
     8lTOW5/2yVab+uZ/vw4yxR64+KdyBuVopXV9STuh12Q0JSrXzdH82iQIDAQABozgw 
     9NjAMBgNVHRMBAf8EAjAAMCYGA1UdEQQfMB2CCWxvY2FsaG9zdIIQbG9jYWxob3N0 
     10LmRvbWFpbjANBgkqhkiG9w0BAQQFAAOBgQBAAQCTkLfgYAjvm63KRXcE8djkYIVQ 
     11LleHNrCad/v3zNFK0PPCjIeBSWlI/1bPhJDCpfwpvJLk86DrB97Q3IafU2ml7DkC 
     1293bi3iaDy4jI1uskvlM516iaBQx1DCIa4gesluBAnZFvby8HX9y/A7tn5Ew2vdQJ 
     13upkcCUswsU4MSA== 
    6114-----END CERTIFICATE----- 
    6215-----BEGIN RSA PRIVATE KEY----- 
    63 MIIEowIBAAKCAQEAwOCUwunA35Y2uk0OP7xBUXtP/tiCR1L4Nlc1FTuDd7qEqqNI 
    64 8AMLWrcxQI0/hwWeBsZyH8p97XM80HZNOzKJ5x9bhCe/i3IJKtRAjSzEwyNobPRi 
    65 VajgLorItF+/4RjXaqYakG3mgxcQOpW12g1EP9/7bMWevx0EXxwWzp73nYH4/spD 
    66 gl9ryHAX+OjzdNn7rBSvmY/9863ifo3zvYkV8DnqUXwpgYy8umNraeDBRi8nk4OF 
    67 vou7qrh2w+yK9lDhw5CeRx0ZaEBiWROL6+iJZCDso7fnso+Y8mS0qm7Q8XP86u0Z 
    68 GWeYEfWVynYLx0M1PFMjtWewtSZZ0cU+StFw3QIDAQABAoIBABL7h2iPfO4EaKp5 
    69 PvfC3WLZkgvw3xGJ9ufSOWU3kD7OWpQ4scr9Ybax5OUHgcMWKHFeQokicrZV6xxR 
    70 KFS1KqFWkrk0+EMPHBvc++VpDIxwBa0DeFIZ5sZt3kbyTX4n5buXUXH5fwBT2sMJ 
    71 TPaC676lmqcf4/nHL1D1AMGhH5merxGFGBapMLaMYQDP0dFF6av1q11IAtT8CWjt 
    72 dTJhKsRwoPkkjjDLvVdGXuud+CE8fFUJwS73OacXxqG2CHAjUkDM89QQtHsb/Wfo 
    73 crF6JfH2vErBoTw4LVyJ8qeUGmkvRoInmJd+M/MT0fMtOLJe8Sj8h3LAvfGxtke2 
    74 a6j/sLkCgYEA+IAvE8reQ+3yroIGKees1S2+b0qqi0vKYjqD+qdpawc+GwbuMtHc 
    75 4fOo9VqjknLJwgpZDu6H5+8s+XJLGJbz8H3N9dgVhGsBd4KwNeVB//oKC5aNYQc7 
    76 oDYbpHqGFA1f+bQa1qPd2AF00jXqU+Lk1/l3z87hK3sLcrAWG5Dms+MCgYEAxrKs 
    77 RMMfYnI4hy9Aqy9cL2OcsB3dRGrPo/LMhy7L4Fkr25qq4mQKa+v4DVulf4HZOpw2 
    78 rghHbyVNL/GiUGQiqYIe31L8w8BXviaRReoy+47lBLaQ2NVX4Lv+y7N9p6U4xxEc 
    79 m+CCtSN74YvYzRpIKBRaPSWf+UNTqRRSDEjn5D8CgYEAu9YYv7s+2tYH9MSv6AkI 
    80 6XLUWcd0tiop5qoYjOTymEY3ObK5Zoyfi+PkOOG0dsRxoUy1GMZQ0I5Hzp4ICaRA 
    81 6+4MOuKFETzZNP8CNxr+EoFsCmpYn5kaBvYfWuqKYqnhfBwZlVj0HYysQyEh6Rq+ 
    82 pEobuGbGaVluw9g6Pcf/usUCgYAv6k5YlqUu3FR9ZQu3PEiCtQbIAaumIAvKgXaI 
    83 8uP/SgGlh3rF9VH+DH1Y20zhnrJ/y8Pz29M+HkSq1x5JPJyPO+2t9Rk3K179X9eQ 
    84 gJWizCa2KEBtyaTTcQJUpQgcMV+rwZigjld2zwPEtDCn5TqZT68jJ7uYJIA8OcY/ 
    85 aCVjiQKBgFSIhub8r68DnC/UQUh2ktTTB+0VbqMxPWVohs9PJPE2fInUcei1KPHL 
    86 MceNKch+bfbJr64Ru3JKgqFQKsmhVGzLQXX49qDRHT30yGKpcGw2b6H4DUB2FR9L 
    87 6tVZKWeKspmaMGrdDs5/XuK4soE60oPO0nUiB7Sh70shN9/lWAfw 
     16MIICWwIBAAKBgQCdhZgzD0xusZqzdphETJPgb4QK/sdDpF8EOT/20bAuyRgGt7pa 
     17pJmc6UtdgS5b9bGh6sRXx+vSKiTqq1ZFLOjnn3OQKhdrK2VU8XiD5rjuwTuNzser 
     180ubalTOW5/2yVab+uZ/vw4yxR64+KdyBuVopXV9STuh12Q0JSrXzdH82iQIDAQAB 
     19AoGAejr+HTDT2FlMd9Gg2e6qGM+voHCO4vgbGsXp0nZnxgYY9K2Al3F+GXoWFxp0 
     20hLsj+UaY0Jy7art1JfuJ1+e/WTR+0s4c6IbZCy0fHF4i29wUI5lc0zSmtePgITOD 
     21tvgtJ8ji+ESq7sRyXO0Eb8wFJPyLj3efoeBQUl8Om1XMYGECQQDLayMY8dgqZCMK 
     22iRU0wrCgzu/1tNBv1hRwip+rOTiqqL+MAKSYg1XtWSlm2RojiNmBfvPo+7VrXZMu 
     23Nt1cBoOtAkEAxj1TuJRmZMf1QFuvv6DLloMmhilGkFobWysUZW18J8FyM+vI5kvH 
     24TjRp2ZGkSw7Fsl+MUpQdfNOkd7pilJd5zQJAPofWqCpf2tghdXGiVS+sACLc3NkS 
     25Ye6bJeVXI9lZNAzfpPfloQRue6G2+miuglHlGsudyvblU/XV8pTnAwz1mQJACyu3 
     26hQYvwuwVoNvJyoWYE1IuoI7A4C+DrR5/VrvVrDPVaKGXv4pzn6+Ka20ukeAyObvy 
     27n1CjXL5cXTbOiUsD3QJAPe8Rw/Nu3o76tZfWB3irvjZ/mUDPhEppSis5oJY/exoB 
     28O96/99UXZNwSbDII0gjBPN2pd2kf/Ik3EQlxiryZuw== 
    8829-----END RSA PRIVATE KEY----- 
  • trunk/MyProxyWebService/myproxy/ws/test/test_myproxywsgi.cfg

    r6997 r8101  
    1616# from tty by commenting out or removing the password option here 
    1717username: pjk 
    18 password = mypassword 
     18password = testpassword 
    1919uri = https://localhost:10443/logon 
    2020 
     
    2323# from tty by commenting out or removing the password option here 
    2424username: pjk 
    25 password = mypassword 
     25password = testpassword 
    2626uri = https://localhost:10443/logon 
    2727 
  • trunk/MyProxyWebService/myproxy/ws/test/test_myproxywsgi.py

    r7769 r8101  
    2222from paste.deploy import loadapp 
    2323 
    24 from myproxy.ws.server.wsgi.middleware import MyProxyClientMiddleware 
     24from myproxy.ws.server.wsgi.middleware import MyProxyLogonWSMiddleware 
    2525 
    2626 
     
    3131    def __call__(self, environ, start_response): 
    3232         
    33         assert(environ[MyProxyClientMiddleware.DEFAULT_CLIENT_ENV_KEYNAME]) 
    34         assert(environ[MyProxyClientMiddleware.DEFAULT_LOGON_FUNC_ENV_KEYNAME]) 
     33        assert(environ[MyProxyLogonWSMiddleware.DEFAULT_CLIENT_ENV_KEYNAME]) 
    3534        status = "200 OK" 
    3635                 
     
    4544    def __init__(self, *args, **kwargs): 
    4645        app = TestMyProxyClientMiddlewareApp() 
    47         app = MyProxyClientMiddleware.filter_app_factory(app, {}, prefix='') 
     46        app = MyProxyLogonWSMiddleware.filter_app_factory(app, {}, prefix='') 
    4847        self.app = paste.fixture.TestApp(app) 
    4948          
     
    113112         
    114113        postData = { 
    115             MyProxyClientMiddleware.CERT_REQ_POST_PARAM_KEYNAME: certReq 
     114            MyProxyLogonWSMiddleware.CERT_REQ_POST_PARAM_KEYNAME: certReq 
    116115        } 
    117116        response = self.app.post('/logon', postData, headers=headers,  
  • trunk/MyProxyWebService/myproxy/ws/test/test_myproxywsgi_with_paster.py

    r8085 r8101  
    144144        self.assert_(subj) 
    145145        self.assert_(subj.CN) 
    146         print("Returned certificate subject CN=%r" % subj.CN) 
     146        print("Returned certificate subject CN=%r" % subj) 
    147147         
    148148    def addService(self, *arg, **kw): 
Note: See TracChangeset for help on using the changeset viewer.