kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

[AWS|ELB] actually check PublicKey

Browse source
This commit is contained in:
Michael Hale 2013-08-02 22:57:02 -04:00
parent 5c1a859852
commit 8ac4754bd5
6 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/aws/models/elb/model_tests.rb
View file

@ -83,7 +83,7 @@ Shindo.tests('AWS::ELB | models', ['aws', 'elb']) do
# Need to sleep here for IAM changes to propgate
tests('with ListenerDescriptions') do
@certificate = Fog::AWS[:iam].upload_server_certificate(AWS::IAM::SERVER_CERT_PUBLIC_KEY, AWS::IAM::SERVER_CERT_PRIVATE_KEY, @key_name).body['Certificate']
@certificate = Fog::AWS[:iam].upload_server_certificate(AWS::IAM::SERVER_CERT, AWS::IAM::SERVER_CERT_PRIVATE_KEY, @key_name).body['Certificate']
sleep(10) unless Fog.mocking?
listeners = [{
'Listener' => {
@ -284,7 +284,7 @@ Shindo.tests('AWS::ELB | models', ['aws', 'elb']) do
returns(public_key_policy_id) { policy.id }
returns("PublicKeyPolicyType") { policy.type_name }
returns(false) { policy.policy_attributes["PublicKey"].nil? }
returns(AWS::IAM::SERVER_CERT_PUBLIC_KEY) { policy.policy_attributes["PublicKey"] }
end
tests('a malformed policy') do

2
tests/aws/requests/elb/listener_tests.rb
View file

@ -4,7 +4,7 @@ Shindo.tests('AWS::ELB | listener_tests', ['aws', 'elb']) do
tests('success') do
Fog::AWS[:elb].create_load_balancer(['us-east-1a'], @load_balancer_id, [{'LoadBalancerPort' => 80, 'InstancePort' => 80, 'Protocol' => 'HTTP'}])
@certificate = Fog::AWS[:iam].upload_server_certificate(AWS::IAM::SERVER_CERT_PUBLIC_KEY, AWS::IAM::SERVER_CERT_PRIVATE_KEY, @key_name).body['Certificate']
@certificate = Fog::AWS[:iam].upload_server_certificate(AWS::IAM::SERVER_CERT, AWS::IAM::SERVER_CERT_PRIVATE_KEY, @key_name).body['Certificate']
tests("#create_load_balancer_listeners").formats(AWS::ELB::Formats::BASIC) do
listeners = [

2
tests/aws/requests/elb/load_balancer_tests.rb
View file

@ -7,7 +7,7 @@ Shindo.tests('AWS::ELB | load_balancer_tests', ['aws', 'elb']) do
Fog::AWS[:iam].delete_server_certificate(@key_name)
end
@certificate = Fog::AWS[:iam].upload_server_certificate(AWS::IAM::SERVER_CERT_PUBLIC_KEY, AWS::IAM::SERVER_CERT_PRIVATE_KEY, @key_name).body['Certificate']
@certificate = Fog::AWS[:iam].upload_server_certificate(AWS::IAM::SERVER_CERT, AWS::IAM::SERVER_CERT_PRIVATE_KEY, @key_name).body['Certificate']
tests("#create_load_balancer").formats(AWS::ELB::Formats::CREATE_LOAD_BALANCER) do
zones = ['us-east-1a']

2
tests/aws/requests/elb/policy_tests.rb
View file

@ -27,7 +27,7 @@ Shindo.tests('AWS::ELB | policy_tests', ['aws', 'elb']) do
tests("#create_load_balancer_policy").formats(AWS::ELB::Formats::BASIC) do
policy = 'fog-policy'
Fog::AWS[:elb].create_load_balancer_policy(@load_balancer_id, policy, 'PublicKeyPolicyType', {'PublicKey' => AWS::IAM::SERVER_CERT_PUBLIC_KEY}).body
Fog::AWS[:elb].create_load_balancer_policy(@load_balancer_id, policy, 'PublicKeyPolicyType', {'PublicKey' => AWS::IAM::SERVER_CERT}).body
end
tests("#describe_load_balancer_policies").formats(AWS::ELB::Formats::DESCRIBE_LOAD_BALANCER_POLICIES) do

5
tests/aws/requests/iam/helper.rb
View file

@ -4,7 +4,7 @@ class AWS
# A self-signed test keypair. Generated using the command:
# openssl req -new -newkey rsa:1024 -days 3650 -nodes -x509 -keyout server-private.key -out server-public.crt
# NB: Amazon returns an error on extraneous linebreaks
SERVER_CERT_PUBLIC_KEY = %{-----BEGIN CERTIFICATE-----
SERVER_CERT = %{-----BEGIN CERTIFICATE-----
MIIDQzCCAqygAwIBAgIJAJaZ8wH+19AtMA0GCSqGSIb3DQEBBQUAMHUxCzAJBgNV
BAYTAlVTMREwDwYDVQQIEwhOZXcgWW9yazERMA8GA1UEBxMITmV3IFlvcmsxHzAd
BgNVBAoTFkZvZyBUZXN0IFNuYWtlb2lsIENlcnQxHzAdBgNVBAsTFkZvZyBUZXN0
@ -25,6 +25,9 @@ DF3qnnPyArLFx0HLB7wQdm9xYVIqQuLO+V6GRuOd+uSX//aDLDZhwbERf35hoyto
Jfk4gX/qwuRFNy0vjQeTzdvhB1igG/w=
-----END CERTIFICATE-----
}
# The public key for SERVER_CERT. Generated using the command:
# openssl x509 -inform pem -in server-public.crt -pubkey -noout > server.pubkey
SERVER_CERT_PUBLIC_KEY = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC0CR76sovjdmpWRmEaf8XaG+nGe7czhpdLKkau2b16VtSjkPctxPL5U4vaMxQUboLPr+9oL+9fSYN31VzDD4hyaeGoeI5fhnGeqk71kq5uHONBOQUMbZbBQ8PVd9Sdk+y9JJ6E5fC+GhLL5I+y2DK7syBzyymq1Wi6rPp1XXF7AQIDAQAB"
SERVER_CERT_PRIVATE_KEY = %{-----BEGIN RSA PRIVATE KEY-----
MIICXAIBAAKBgQC0CR76sovjdmpWRmEaf8XaG+nGe7czhpdLKkau2b16VtSjkPct

4
tests/aws/requests/iam/server_certificate_tests.rb
View file

@ -25,7 +25,7 @@ Shindo.tests('AWS::IAM | server certificate requests', ['aws']) do
}
tests('#upload_server_certificate') do
public_key = AWS::IAM::SERVER_CERT_PUBLIC_KEY
public_key = AWS::IAM::SERVER_CERT
private_key = AWS::IAM::SERVER_CERT_PRIVATE_KEY
private_key_pkcs8 = AWS::IAM::SERVER_CERT_PRIVATE_KEY_PKCS8
private_key_mismatch = AWS::IAM::SERVER_CERT_PRIVATE_KEY_MISMATCHED
@ -68,7 +68,7 @@ Shindo.tests('AWS::IAM | server certificate requests', ['aws']) do
end
tests('#update_server_certificate') do
public_key = AWS::IAM::SERVER_CERT_PUBLIC_KEY
public_key = AWS::IAM::SERVER_CERT
private_key = AWS::IAM::SERVER_CERT_PRIVATE_KEY
key_name = "update-key"