Skip to content

add curl's ANY and ANSAFE authorization options #1187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
COM8 merged 2 commits into from
Feb 24, 2025
Merged

add curl's ANY and ANSAFE authorization options #1187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8df86bf
add curl's ANY and ANYSAFE authentication options
hyOzd Feb 23, 2025
c6cb85c
add basic tests for ANY and ANYSAFE auth options
hyOzd Feb 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions cpr/session.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,14 @@ void Session::SetAuth(const Authentication& auth) {
curl_easy_setopt(curl_->handle, CURLOPT_HTTPAUTH, CURLAUTH_NEGOTIATE);
curl_easy_setopt(curl_->handle, CURLOPT_USERPWD, auth.GetAuthString());
break;
case AuthMode::ANY:
curl_easy_setopt(curl_->handle, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
curl_easy_setopt(curl_->handle, CURLOPT_USERPWD, auth.GetAuthString());
break;
case AuthMode::ANYSAFE:
curl_easy_setopt(curl_->handle, CURLOPT_HTTPAUTH, CURLAUTH_ANYSAFE);
curl_easy_setopt(curl_->handle, CURLOPT_USERPWD, auth.GetAuthString());
break;
}
}

Expand Down
2 changes: 1 addition & 1 deletion include/cpr/auth.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace cpr {

enum class AuthMode { BASIC, DIGEST, NTLM, NEGOTIATE };
enum class AuthMode { BASIC, DIGEST, NTLM, NEGOTIATE, ANY, ANYSAFE };

class Authentication {
public:
Expand Down
43 changes: 43 additions & 0 deletions test/session_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,6 +738,49 @@ TEST(DigestTests, SetDigestTest) {
EXPECT_EQ(ErrorCode::OK, response.error.code);
}

TEST(AnyAuthTests, SetAnyTest) {
Url url{server->GetBaseUrl() + "/digest_auth.html"};
Session session;
session.SetUrl(url);
session.SetAuth({"user", "password", AuthMode::ANY});
Response response = session.Get();
std::string expected_text{"Header reflect GET"};
EXPECT_EQ(expected_text, response.text);
EXPECT_EQ(url, response.url);
EXPECT_EQ(std::string{"text/html"}, response.header["content-type"]);
EXPECT_EQ(200, response.status_code);
EXPECT_EQ(ErrorCode::OK, response.error.code);
}

TEST(AnyAuthTests, SetAnySafeTest) {
Authentication auth = {"user", "password", AuthMode::ANYSAFE};
{
Url url{server->GetBaseUrl() + "/digest_auth.html"};
Session session;
session.SetUrl(url);
session.SetAuth(auth);
Response response = session.Get();
std::string expected_text{"Header reflect GET"};
EXPECT_EQ(expected_text, response.text);
EXPECT_EQ(url, response.url);
EXPECT_EQ(std::string{"text/html"}, response.header["content-type"]);
EXPECT_EQ(200, response.status_code);
EXPECT_EQ(ErrorCode::OK, response.error.code);
}
{
Url url{server->GetBaseUrl() + "/basic_auth.html"};
Session session;
session.SetUrl(url);
session.SetAuth(auth);
Response response = session.Get();
EXPECT_EQ(std::string{"Unauthorized"}, response.text);
EXPECT_EQ(url, response.url);
EXPECT_EQ(std::string{"text/plain"}, response.header["content-type"]);
EXPECT_EQ(401, response.status_code);
EXPECT_EQ(ErrorCode::OK, response.error.code);
}
}

TEST(UserAgentTests, SetUserAgentTest) {
Url url{server->GetBaseUrl() + "/header_reflect.html"};
UserAgent userAgent{"Test User Agent"};
Expand Down
Loading