thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 00:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #60181 from ClickHouse/revert-58900-restriction_for_s3_access_key_id

Browse Source 
Revert "Restriction for the access key id for s3."
This commit is contained in:
Alexey Milovidov 2024-02-20 12:34:27 +01:00 committed by GitHub
commit 946d65dbdc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/IO/S3/Client.cpp
View File

@ -27,7 +27,6 @@
#include <base/sleep.h>
#include <algorithm>
namespace ProfileEvents
{
@ -48,7 +47,6 @@ namespace ErrorCodes
{
extern const int LOGICAL_ERROR;
extern const int TOO_MANY_REDIRECTS;
extern const int BAD_ARGUMENTS;
}
namespace S3
@ -106,19 +104,6 @@ void verifyClientConfiguration(const Aws::Client::ClientConfiguration & client_c
assert_cast<const Client::RetryStrategy &>(*client_config.retryStrategy);
}
void validateCredentials(const Aws::Auth::AWSCredentials& auth_credentials)
{
if (auth_credentials.GetAWSAccessKeyId().empty())
{
return;
}
/// Follow https://docs.aws.amazon.com/IAM/latest/APIReference/API_AccessKey.html
if (!std::all_of(auth_credentials.GetAWSAccessKeyId().begin(), auth_credentials.GetAWSAccessKeyId().end(), isWordCharASCII))
{
throw Exception(ErrorCodes::BAD_ARGUMENTS, "Access key id has an invalid character");
}
}
void addAdditionalAMZHeadersToCanonicalHeadersList(
Aws::AmazonWebServiceRequest & request,
const HTTPHeaderEntries & extra_headers
@ -144,7 +129,6 @@ std::unique_ptr<Client> Client::create(
const ClientSettings & client_settings)
{
verifyClientConfiguration(client_configuration);
validateCredentials(credentials_provider->GetAWSCredentials());
return std::unique_ptr<Client>(
new Client(max_redirects_, std::move(sse_kms_config_), credentials_provider, client_configuration, sign_payloads, client_settings));
}

0
tests/queries/0_stateless/02966_s3_access_key_id_restriction.reference
View File

6
tests/queries/0_stateless/02966_s3_access_key_id_restriction.sql
View File

@ -1,6 +0,0 @@
-- Tags: no-fasttest
select * from s3('http://localhost:11111/test/a.tsv', '\ninjection\n', 'admin'); -- { serverError 36 }
select * from deltaLake('http://localhost:11111/test/a.tsv', '\ninjection\n', 'admin'); -- { serverError 36 }
select * from hudi('http://localhost:11111/test/a.tsv', '\ninjection\n', 'admin'); -- { serverError 36 }
select * from iceberg('http://localhost:11111/test/a.tsv', '\ninjection\n', 'admin'); -- { serverError 36 }