| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "chrome/browser/url_fixer_upper.h" | 7 #include "chrome/browser/url_fixer_upper.h" |
| 8 #include "chrome/common/chrome_switches.h" | 8 #include "chrome/common/chrome_switches.h" |
| 9 #include "chrome/test/automation/tab_proxy.h" | 9 #include "chrome/test/automation/tab_proxy.h" |
| 10 #include "chrome/test/automation/browser_proxy.h" | 10 #include "chrome/test/automation/browser_proxy.h" |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 | 55 |
| 56 wstring ExpectedTitleFromAuth(wstring username, wstring password) { | 56 wstring ExpectedTitleFromAuth(wstring username, wstring password) { |
| 57 // The TestServer sets the title to username/password on successful login. | 57 // The TestServer sets the title to username/password on successful login. |
| 58 return username + L"/" + password; | 58 return username + L"/" + password; |
| 59 } | 59 } |
| 60 | 60 |
| 61 } // namespace | 61 } // namespace |
| 62 | 62 |
| 63 // Test that "Basic" HTTP authentication works. | 63 // Test that "Basic" HTTP authentication works. |
| 64 TEST_F(LoginPromptTest, TestBasicAuth) { | 64 TEST_F(LoginPromptTest, TestBasicAuth) { |
| 65 TestServer server(kDocRoot); | 65 scoped_refptr<HTTPTestServer> server = |
| 66 HTTPTestServer::CreateServer(kDocRoot); |
| 67 ASSERT_TRUE(NULL != server.get()); |
| 66 ::scoped_ptr<TabProxy> tab(GetActiveTabProxy()); | 68 ::scoped_ptr<TabProxy> tab(GetActiveTabProxy()); |
| 67 NavigateTab(tab.get(), server.TestServerPageW(L"auth-basic")); | 69 NavigateTab(tab.get(), server->TestServerPageW(L"auth-basic")); |
| 68 | 70 |
| 69 EXPECT_TRUE(tab->NeedsAuth()); | 71 EXPECT_TRUE(tab->NeedsAuth()); |
| 70 EXPECT_FALSE(tab->SetAuth(username_basic_, password_bad_)); | 72 EXPECT_FALSE(tab->SetAuth(username_basic_, password_bad_)); |
| 71 EXPECT_TRUE(tab->NeedsAuth()); | 73 EXPECT_TRUE(tab->NeedsAuth()); |
| 72 EXPECT_TRUE(tab->CancelAuth()); | 74 EXPECT_TRUE(tab->CancelAuth()); |
| 73 EXPECT_EQ(L"Denied: wrong password", GetActiveTabTitle()); | 75 EXPECT_EQ(L"Denied: wrong password", GetActiveTabTitle()); |
| 74 | 76 |
| 75 NavigateTab(tab.get(), server.TestServerPageW(L"auth-basic")); | 77 NavigateTab(tab.get(), server->TestServerPageW(L"auth-basic")); |
| 76 | 78 |
| 77 EXPECT_TRUE(tab->NeedsAuth()); | 79 EXPECT_TRUE(tab->NeedsAuth()); |
| 78 EXPECT_TRUE(tab->SetAuth(username_basic_, password_)); | 80 EXPECT_TRUE(tab->SetAuth(username_basic_, password_)); |
| 79 EXPECT_EQ(ExpectedTitleFromAuth(username_basic_, password_), | 81 EXPECT_EQ(ExpectedTitleFromAuth(username_basic_, password_), |
| 80 GetActiveTabTitle()); | 82 GetActiveTabTitle()); |
| 81 } | 83 } |
| 82 | 84 |
| 83 // Test that "Digest" HTTP authentication works. | 85 // Test that "Digest" HTTP authentication works. |
| 84 TEST_F(LoginPromptTest, TestDigestAuth) { | 86 TEST_F(LoginPromptTest, TestDigestAuth) { |
| 85 TestServer server(kDocRoot); | 87 scoped_refptr<HTTPTestServer> server = |
| 88 HTTPTestServer::CreateServer(kDocRoot); |
| 89 ASSERT_TRUE(NULL != server.get()); |
| 86 ::scoped_ptr<TabProxy> tab(GetActiveTabProxy()); | 90 ::scoped_ptr<TabProxy> tab(GetActiveTabProxy()); |
| 87 NavigateTab(tab.get(), server.TestServerPageW(L"auth-digest")); | 91 NavigateTab(tab.get(), server->TestServerPageW(L"auth-digest")); |
| 88 | 92 |
| 89 EXPECT_TRUE(tab->NeedsAuth()); | 93 EXPECT_TRUE(tab->NeedsAuth()); |
| 90 EXPECT_FALSE(tab->SetAuth(username_digest_, password_bad_)); | 94 EXPECT_FALSE(tab->SetAuth(username_digest_, password_bad_)); |
| 91 EXPECT_TRUE(tab->CancelAuth()); | 95 EXPECT_TRUE(tab->CancelAuth()); |
| 92 EXPECT_EQ(L"Denied: wrong password", GetActiveTabTitle()); | 96 EXPECT_EQ(L"Denied: wrong password", GetActiveTabTitle()); |
| 93 | 97 |
| 94 NavigateTab(tab.get(), server.TestServerPageW(L"auth-digest")); | 98 NavigateTab(tab.get(), server->TestServerPageW(L"auth-digest")); |
| 95 | 99 |
| 96 EXPECT_TRUE(tab->NeedsAuth()); | 100 EXPECT_TRUE(tab->NeedsAuth()); |
| 97 EXPECT_TRUE(tab->SetAuth(username_digest_, password_)); | 101 EXPECT_TRUE(tab->SetAuth(username_digest_, password_)); |
| 98 EXPECT_EQ(ExpectedTitleFromAuth(username_digest_, password_), | 102 EXPECT_EQ(ExpectedTitleFromAuth(username_digest_, password_), |
| 99 GetActiveTabTitle()); | 103 GetActiveTabTitle()); |
| 100 } | 104 } |
| 101 | 105 |
| 102 // Test that logging in on 2 tabs at once works. | 106 // Test that logging in on 2 tabs at once works. |
| 103 TEST_F(LoginPromptTest, TestTwoAuths) { | 107 TEST_F(LoginPromptTest, TestTwoAuths) { |
| 104 TestServer server(kDocRoot); | 108 scoped_refptr<HTTPTestServer> server = |
| 109 HTTPTestServer::CreateServer(kDocRoot); |
| 110 ASSERT_TRUE(NULL != server.get()); |
| 105 | 111 |
| 106 ::scoped_ptr<TabProxy> basic_tab(GetActiveTabProxy()); | 112 ::scoped_ptr<TabProxy> basic_tab(GetActiveTabProxy()); |
| 107 NavigateTab(basic_tab.get(), server.TestServerPageW(L"auth-basic")); | 113 NavigateTab(basic_tab.get(), server->TestServerPageW(L"auth-basic")); |
| 108 | 114 |
| 109 AppendTab(GURL("about:blank")); | 115 AppendTab(GURL("about:blank")); |
| 110 ::scoped_ptr<TabProxy> digest_tab(GetActiveTabProxy()); | 116 ::scoped_ptr<TabProxy> digest_tab(GetActiveTabProxy()); |
| 111 NavigateTab(digest_tab.get(), server.TestServerPageW(L"auth-digest")); | 117 NavigateTab(digest_tab.get(), server->TestServerPageW(L"auth-digest")); |
| 112 | 118 |
| 113 // TODO(devint): http://b/1158262 basic_tab is not active, so this logs in to | 119 // TODO(devint): http://b/1158262 basic_tab is not active, so this logs in to |
| 114 // a page whose tab isn't active, which isn't actually possible for the user | 120 // a page whose tab isn't active, which isn't actually possible for the user |
| 115 // to do. I had a fix for this, but I'm reverting it to see if it makes the | 121 // to do. I had a fix for this, but I'm reverting it to see if it makes the |
| 116 // test less flaky. | 122 // test less flaky. |
| 117 EXPECT_TRUE(basic_tab->NeedsAuth()); | 123 EXPECT_TRUE(basic_tab->NeedsAuth()); |
| 118 EXPECT_TRUE(basic_tab->SetAuth(username_basic_, password_)); | 124 EXPECT_TRUE(basic_tab->SetAuth(username_basic_, password_)); |
| 119 EXPECT_TRUE(digest_tab->NeedsAuth()); | 125 EXPECT_TRUE(digest_tab->NeedsAuth()); |
| 120 EXPECT_TRUE(digest_tab->SetAuth(username_digest_, password_)); | 126 EXPECT_TRUE(digest_tab->SetAuth(username_digest_, password_)); |
| 121 | 127 |
| 122 wstring title; | 128 wstring title; |
| 123 EXPECT_TRUE(basic_tab->GetTabTitle(&title)); | 129 EXPECT_TRUE(basic_tab->GetTabTitle(&title)); |
| 124 EXPECT_EQ(ExpectedTitleFromAuth(username_basic_, password_), title); | 130 EXPECT_EQ(ExpectedTitleFromAuth(username_basic_, password_), title); |
| 125 | 131 |
| 126 EXPECT_TRUE(digest_tab->GetTabTitle(&title)); | 132 EXPECT_TRUE(digest_tab->GetTabTitle(&title)); |
| 127 EXPECT_EQ(ExpectedTitleFromAuth(username_digest_, password_), title); | 133 EXPECT_EQ(ExpectedTitleFromAuth(username_digest_, password_), title); |
| 128 } | 134 } |
| 129 | 135 |
| 130 // Test that cancelling authentication works. | 136 // Test that cancelling authentication works. |
| 131 TEST_F(LoginPromptTest, TestCancelAuth) { | 137 TEST_F(LoginPromptTest, TestCancelAuth) { |
| 132 TestServer server(kDocRoot); | 138 scoped_refptr<HTTPTestServer> server = |
| 139 HTTPTestServer::CreateServer(kDocRoot); |
| 140 ASSERT_TRUE(NULL != server.get()); |
| 133 ::scoped_ptr<TabProxy> tab(GetActiveTabProxy()); | 141 ::scoped_ptr<TabProxy> tab(GetActiveTabProxy()); |
| 134 | 142 |
| 135 // First navigate to a test server page so we have something to go back to. | 143 // First navigate to a test server page so we have something to go back to. |
| 136 EXPECT_TRUE(tab->NavigateToURL(server.TestServerPageW(L"a"))); | 144 EXPECT_TRUE(tab->NavigateToURL(server->TestServerPageW(L"a"))); |
| 137 | 145 |
| 138 // Navigating while auth is requested is the same as cancelling. | 146 // Navigating while auth is requested is the same as cancelling. |
| 139 NavigateTab(tab.get(), server.TestServerPageW(L"auth-basic")); | 147 NavigateTab(tab.get(), server->TestServerPageW(L"auth-basic")); |
| 140 EXPECT_TRUE(tab->NeedsAuth()); | 148 EXPECT_TRUE(tab->NeedsAuth()); |
| 141 EXPECT_TRUE(tab->NavigateToURL(server.TestServerPageW(L"b"))); | 149 EXPECT_TRUE(tab->NavigateToURL(server->TestServerPageW(L"b"))); |
| 142 EXPECT_FALSE(tab->NeedsAuth()); | 150 EXPECT_FALSE(tab->NeedsAuth()); |
| 143 | 151 |
| 144 NavigateTab(tab.get(), server.TestServerPageW(L"auth-basic")); | 152 NavigateTab(tab.get(), server->TestServerPageW(L"auth-basic")); |
| 145 EXPECT_TRUE(tab->NeedsAuth()); | 153 EXPECT_TRUE(tab->NeedsAuth()); |
| 146 EXPECT_TRUE(tab->GoBack()); // should bring us back to 'a' | 154 EXPECT_TRUE(tab->GoBack()); // should bring us back to 'a' |
| 147 EXPECT_FALSE(tab->NeedsAuth()); | 155 EXPECT_FALSE(tab->NeedsAuth()); |
| 148 | 156 |
| 149 // Now add a page and go back, so we have something to go forward to. | 157 // Now add a page and go back, so we have something to go forward to. |
| 150 EXPECT_TRUE(tab->NavigateToURL(server.TestServerPageW(L"c"))); | 158 EXPECT_TRUE(tab->NavigateToURL(server->TestServerPageW(L"c"))); |
| 151 EXPECT_TRUE(tab->GoBack()); // should bring us back to 'a' | 159 EXPECT_TRUE(tab->GoBack()); // should bring us back to 'a' |
| 152 | 160 |
| 153 NavigateTab(tab.get(), server.TestServerPageW(L"auth-basic")); | 161 NavigateTab(tab.get(), server->TestServerPageW(L"auth-basic")); |
| 154 EXPECT_TRUE(tab->NeedsAuth()); | 162 EXPECT_TRUE(tab->NeedsAuth()); |
| 155 EXPECT_TRUE(tab->GoForward()); // should bring us to 'c' | 163 EXPECT_TRUE(tab->GoForward()); // should bring us to 'c' |
| 156 EXPECT_FALSE(tab->NeedsAuth()); | 164 EXPECT_FALSE(tab->NeedsAuth()); |
| 157 | 165 |
| 158 // Now test that cancelling works as expected. | 166 // Now test that cancelling works as expected. |
| 159 NavigateTab(tab.get(), server.TestServerPageW(L"auth-basic")); | 167 NavigateTab(tab.get(), server->TestServerPageW(L"auth-basic")); |
| 160 EXPECT_TRUE(tab->NeedsAuth()); | 168 EXPECT_TRUE(tab->NeedsAuth()); |
| 161 EXPECT_TRUE(tab->CancelAuth()); | 169 EXPECT_TRUE(tab->CancelAuth()); |
| 162 EXPECT_FALSE(tab->NeedsAuth()); | 170 EXPECT_FALSE(tab->NeedsAuth()); |
| 163 EXPECT_EQ(L"Denied: no auth", GetActiveTabTitle()); | 171 EXPECT_EQ(L"Denied: no auth", GetActiveTabTitle()); |
| 164 } | 172 } |
| 165 | 173 |
| OLD | NEW |