Fix commets in review

Author: molotkov-and

ydb/mvp/oidc_proxy/context.cpp

@@ -11,22 +11,22 @@ namespace NOIDC {
 
 TContext::TContext(const TString& state, const TString& requestedAddress, bool isAjaxRequest)
     : State(state)
-    , IsAjaxRequest(isAjaxRequest)
+    , AjaxRequest(isAjaxRequest)
     , RequestedAddress(requestedAddress)
 {}
 
 TContext::TContext(const NHttp::THttpIncomingRequestPtr& request)
     : State(GenerateState())
-    , IsAjaxRequest(DetectAjaxRequest(request))
-    , RequestedAddress(GetRequestedUrl(request, IsAjaxRequest))
+    , AjaxRequest(DetectAjaxRequest(request))
+    , RequestedAddress(GetRequestedUrl(request, AjaxRequest))
 {}
 
 TString TContext::GetState() const {
     return State;
 }
 
-bool TContext::GetIsAjaxRequest() const {
-    return IsAjaxRequest;
+bool TContext::IsAjaxRequest() const {
+    return AjaxRequest;
 }
 
 TString TContext::GetRequestedAddress() const {
@@ -49,7 +49,7 @@ TString TContext::GenerateCookie(const TString& secret) const {
     stateStruct << "{\"state\":\"" << State
                 << "\",\"requested_address\":\"" << RequestedAddress
                 << "\",\"expiration_time\":" << ToString(expirationTime.TimeT())
-                << ",\"ajax_request\":" << (IsAjaxRequest ? "true" : "false") << "}";
+                << ",\"ajax_request\":" << (AjaxRequest ? "true" : "false") << "}";
     TString digest = HmacSHA256(secret, stateStruct);
     TString cookieStruct {"{\"state_struct\":\"" + Base64Encode(stateStruct) + "\",\"digest\":\"" + Base64Encode(digest) + "\"}"};
     return Base64Encode(cookieStruct);

ydb/mvp/oidc_proxy/context.h

@@ -16,15 +16,15 @@ namespace NOIDC {
 class TContext {
 private:
     TString State;
-    bool IsAjaxRequest = false;
+    bool AjaxRequest = false;
     TString RequestedAddress;
 
 public:
     TContext(const TString& state = "", const TString& requestedAddress = "", bool isAjaxRequest = false);
     TContext(const NHttp::THttpIncomingRequestPtr& request);
 
     TString GetState() const;
-    bool GetIsAjaxRequest() const;
+    bool IsAjaxRequest() const;
     TString GetRequestedAddress() const;
 
     TString CreateYdbOidcCookie(const TString& secret) const;

ydb/mvp/oidc_proxy/oidc_session_create_yandex.cpp

@@ -68,7 +68,7 @@ void THandlerSessionCreateYandex::HandleCreateSession(TEvPrivate::TEvCreateSessi
 void THandlerSessionCreateYandex::HandleError(TEvPrivate::TEvErrorResponse::TPtr event, const NActors::TActorContext& ctx) {
     LOG_DEBUG_S(ctx, EService::MVP, "SessionService.Create(): " << event->Get()->Status);
     if (event->Get()->Status == "400") {
-        RetryRequestToProtectedResource(ctx, "Can not create session cookie");
+        RetryRequestToProtectedResource(ctx, "Cannot create session cookie");
     } else {
         NHttp::THeadersBuilder responseHeaders;
         responseHeaders.Set("Content-Type", "text/plain");

ydb/mvp/oidc_proxy/openid_connect.cpp

@@ -75,7 +75,7 @@ NHttp::THttpOutgoingResponsePtr GetHttpOutgoingResponsePtr(const NHttp::THttpInc
                                                                      << GetAuthCallbackUrl();
     NHttp::THeadersBuilder responseHeaders;
     responseHeaders.Set("Set-Cookie", context.CreateYdbOidcCookie(settings.ClientSecret));
-    if (context.GetIsAjaxRequest()) {
+    if (context.IsAjaxRequest()) {
         return CreateResponseForAjaxRequest(request, responseHeaders, redirectUrl);
     }
     responseHeaders.Set("Location", redirectUrl);
@@ -122,16 +122,21 @@ TRestoreOidcContextResult RestoreSessionStoredOnClientSide(const TString& state,
             stateStruct = jsonStateStruct->GetStringRobust();
             stateStruct = Base64Decode(stateStruct);
         }
+        if (stateStruct.Empty()) {
+            return TRestoreOidcContextResult({.IsSuccess = false,
+                                         .IsErrorRetryable = false,
+                                         .ErrorMessage = errorMessage << "Struct with state is empty"});
+        }
         const NJson::TJsonValue* jsonDigest = nullptr;
         if (jsonValue.GetValuePointer("digest", &jsonDigest)) {
             expectedDigest = jsonDigest->GetStringRobust();
             expectedDigest = Base64Decode(expectedDigest);
         }
-    }
-    if (stateStruct.Empty() || expectedDigest.Empty()) {
-        return TRestoreOidcContextResult({.IsSuccess = false,
-                                         .IsErrorRetryable = false,
-                                         .ErrorMessage = errorMessage << "Struct with state and expected digest are empty"});
+        if (expectedDigest.Empty()) {
+            return TRestoreOidcContextResult({.IsSuccess = false,
+                                            .IsErrorRetryable = false,
+                                            .ErrorMessage = errorMessage << "Expected digest is empty"});
+        }
     }
     TString digest = HmacSHA256(secret, stateStruct);
     if (expectedDigest != digest) {
@@ -153,7 +158,7 @@ TRestoreOidcContextResult RestoreSessionStoredOnClientSide(const TString& state,
         } else {
             return TRestoreOidcContextResult({.IsSuccess = false,
                                              .IsErrorRetryable = false,
-                                             .ErrorMessage = errorMessage << "Requested address not found in cookie"});
+                                             .ErrorMessage = errorMessage << "Requested address was not found in the cookie"});
         }
         const NJson::TJsonValue* jsonExpirationTime = nullptr;
         if (jsonValue.GetValuePointer("expiration_time", &jsonExpirationTime)) {
@@ -169,15 +174,15 @@ TRestoreOidcContextResult RestoreSessionStoredOnClientSide(const TString& state,
         } else {
             return TRestoreOidcContextResult({.IsSuccess = false,
                                              .IsErrorRetryable = true,
-                                             .ErrorMessage = errorMessage << "Expiration time not found in json"}, TContext(state, redirectUrl));
+                                             .ErrorMessage = errorMessage << "Expiration time was not found in the json"}, TContext(state, redirectUrl));
         }
         const NJson::TJsonValue* jsonAjaxRequest = nullptr;
         if (jsonValue.GetValuePointer("ajax_request", &jsonAjaxRequest)) {
             isAjaxRequest = jsonAjaxRequest->GetBooleanRobust();
         } else {
             return TRestoreOidcContextResult({.IsSuccess = false,
                                              .IsErrorRetryable = true,
-                                             .ErrorMessage = errorMessage << "Can not detect ajax request"}, TContext(state, redirectUrl));
+                                             .ErrorMessage = errorMessage << "Cannot detect ajax request"}, TContext(state, redirectUrl));
         }
     }
     if (expectedState.Empty() || expectedState != state) {