Skip to content

Removed library/login and library/security libs #267

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.

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
merged 1 commit into from
Jul 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions src/client/table/impl/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ target_link_libraries(client-ydb_table-impl
impl-ydb_internal-session_pool
client-ydb_table-query_stats
yql-public-issue-protos
PRIVATE
OpenSSL::SSL
)

target_sources(client-ydb_table-impl PRIVATE
Expand Down
1 change: 0 additions & 1 deletion src/client/types/credentials/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ add_library(client-ydb_types-credentials)

target_link_libraries(client-ydb_types-credentials PUBLIC
yutil
library-login
api-grpc
client-ydb_types-status
yql-public-issue
Expand Down
17 changes: 9 additions & 8 deletions src/client/types/credentials/login/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
add_library(client-ydb_types-credentials-login)

target_link_libraries(client-ydb_types-credentials-login PUBLIC
yutil
library-login
library-security
api-grpc
client-ydb_types-status
impl-ydb_internal-grpc_connections
yql-public-issue
target_link_libraries(client-ydb_types-credentials-login
PUBLIC
yutil
PRIVATE
api-grpc
client-ydb_types-status
impl-ydb_internal-grpc_connections
yql-public-issue
jwt-cpp::jwt-cpp
)

target_sources(client-ydb_types-credentials-login PRIVATE
Expand Down
30 changes: 27 additions & 3 deletions src/client/types/credentials/login/login.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,37 @@
#include <src/client/impl/ydb_internal/grpc_connections/grpc_connections.h>
#include <src/client/types/core_facility/core_facility.h>
#include <src/api/grpc/ydb_auth_v1.grpc.pb.h>
#include <src/library/login/login.h>
#include <src/library/security/util.h>

#include <ydb-cpp-sdk/util/string/cast.h>

#include <jwt-cpp/jwt.h>

namespace NYdb {

namespace {

// copy-pasted from <robot/library/utils/time_convert.h>
template<typename Rep, typename Period>
constexpr ui64 ToMicroseconds(std::chrono::duration<Rep, Period> value) {
return std::chrono::duration_cast<std::chrono::microseconds>(value).count();
}

template<typename Clock, typename Duration>
constexpr TInstant ToInstant(std::chrono::time_point<Clock, Duration> value) {
return TInstant::MicroSeconds(ToMicroseconds(value.time_since_epoch()));
}

std::chrono::system_clock::time_point GetTokenExpiresAt(const std::string& token) {
try {
jwt::decoded_jwt decoded_token = jwt::decode(token);
return decoded_token.get_expires_at();
}
catch (...) {
}
return {};
}
}

class TLoginCredentialsProvider : public ICredentialsProvider {
public:
TLoginCredentialsProvider(std::weak_ptr<ICoreFacility> facility, TLoginCredentialsParams params);
Expand Down Expand Up @@ -151,7 +175,7 @@ void TLoginCredentialsProvider::ParseToken() { // works under mutex
Token_ = GetToken();
Error_.reset();
TInstant now = TInstant::Now();
TokenExpireAt_ = NKikimr::ToInstant(NLogin::TLoginProvider::GetTokenExpiresAt(Token_.value()));
TokenExpireAt_ = ToInstant(GetTokenExpiresAt(Token_.value()));
TokenRequestAt_ = now + TDuration::Minutes((TokenExpireAt_ - now).Minutes() / 2);
} else {
Token_.reset();
Expand Down
2 changes: 0 additions & 2 deletions src/library/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,13 @@ add_subdirectory(json)
add_subdirectory(jwt)
add_subdirectory(lcs)
add_subdirectory(logger)
add_subdirectory(login)
add_subdirectory(mime)
add_subdirectory(monlib)
add_subdirectory(openssl)
add_subdirectory(operation_id)
add_subdirectory(persqueue)
add_subdirectory(resource)
add_subdirectory(retry)
add_subdirectory(security)
add_subdirectory(streams)
add_subdirectory(string_utils)
add_subdirectory(svnversion)
Expand Down
19 changes: 0 additions & 19 deletions src/library/login/CMakeLists.txt

This file was deleted.

Loading
Loading