From 1798c4aeca70ac8d0a243684d6a798fbc65735f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:57:42 +0100 Subject: gentoo resync : 14.07.2018 --- .../files/libcmis-0.5.2-fix-gdrive-2fa.patch | 70 ---------------------- 1 file changed, 70 deletions(-) delete mode 100644 dev-cpp/libcmis/files/libcmis-0.5.2-fix-gdrive-2fa.patch (limited to 'dev-cpp/libcmis/files') diff --git a/dev-cpp/libcmis/files/libcmis-0.5.2-fix-gdrive-2fa.patch b/dev-cpp/libcmis/files/libcmis-0.5.2-fix-gdrive-2fa.patch deleted file mode 100644 index 3c19e99a5ba9..000000000000 --- a/dev-cpp/libcmis/files/libcmis-0.5.2-fix-gdrive-2fa.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 1effce6d286ba3a9f467e15074b532d2ba4b7c98 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Szymon=20K=C5=82os?= -Date: Wed, 29 Mar 2017 17:45:10 +0200 -Subject: [PATCH] Fix 2FA for Google Drive - ---- - src/libcmis/oauth2-providers.cxx | 15 +++++++++++++-- - 1 file changed, 13 insertions(+), 2 deletions(-) - -diff --git a/src/libcmis/oauth2-providers.cxx b/src/libcmis/oauth2-providers.cxx -index 74c0fec..dd872dd 100644 ---- a/src/libcmis/oauth2-providers.cxx -+++ b/src/libcmis/oauth2-providers.cxx -@@ -37,6 +37,7 @@ - #define CHALLENGE_PAGE_ACTION_LEN sizeof( CHALLENGE_PAGE_ACTION ) - 1 - #define PIN_FORM_ACTION "/signin/challenge/ipp" - #define PIN_FORM_ACTION_LEN sizeof( PIN_FORM_ACTION ) - 1 -+#define PIN_INPUT_NAME "Pin" - - using namespace std; - -@@ -152,7 +153,7 @@ string OAuth2Providers::OAuth2Gdrive( HttpSession* session, const string& authUr - } - - loginChallengeLink = "https://accounts.google.com" + loginChallengeLink; -- loginChallengePost += "Pin="; -+ loginChallengePost += string( PIN_INPUT_NAME ) + "="; - loginChallengePost += string( pin ); - - istringstream loginChallengeIs( loginChallengePost ); -@@ -291,6 +292,8 @@ int OAuth2Providers::parseResponse ( const char* response, string& post, string& - if ( reader == NULL ) return 0; - - bool readInputField = false; -+ bool bIsRightForm = false; -+ bool bHasPinField = false; - - while ( true ) - { -@@ -301,6 +304,12 @@ int OAuth2Providers::parseResponse ( const char* response, string& post, string& - // Find the redirect link - if ( xmlStrEqual( nodeName, BAD_CAST( "form" ) ) ) - { -+ // 2FA: Don't add fields form other forms not having pin field -+ if ( bIsRightForm && !bHasPinField ) -+ post = string( "" ); -+ if ( bIsRightForm && bHasPinField ) -+ break; -+ - xmlChar* action = xmlTextReaderGetAttribute( reader, - BAD_CAST( "action" )); - -@@ -311,7 +320,7 @@ int OAuth2Providers::parseResponse ( const char* response, string& post, string& - bool bChallengePage = ( strncmp( (char*)action, - CHALLENGE_PAGE_ACTION, - CHALLENGE_PAGE_ACTION_LEN ) == 0 ); -- bool bIsRightForm = ( strncmp( (char*)action, -+ bIsRightForm = ( strncmp( (char*)action, - PIN_FORM_ACTION, - PIN_FORM_ACTION_LEN ) == 0 ); - if ( ( xmlStrlen( action ) > 0 ) -@@ -332,6 +341,8 @@ int OAuth2Providers::parseResponse ( const char* response, string& post, string& - BAD_CAST( "name" )); - xmlChar* value = xmlTextReaderGetAttribute( reader, - BAD_CAST( "value" )); -+ if ( name != NULL && strcmp( (char*)name, PIN_INPUT_NAME ) == 0 ) -+ bHasPinField = true; - if ( ( name != NULL ) && ( value!= NULL ) ) - { - if ( ( xmlStrlen( name ) > 0) && ( xmlStrlen( value ) > 0) ) -- cgit v1.2.3