Merge branch 'develop2'

yar229 · Apr 7, 2022 · 164ab94 · 164ab94
2 parents b464860 + adfe0f4
commit 164ab94
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 8 deletions.
diff --git a/MailRuCloud/MailRuCloudApi/Base/Repos/YandexDisk/YadWeb/Requests/YadAuthPasswordRequest.cs b/MailRuCloud/MailRuCloudApi/Base/Repos/YandexDisk/YadWeb/Requests/YadAuthPasswordRequest.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.IO;
 using System.Net;
@@ -28,17 +29,32 @@ public YadAuthPasswordRequest(HttpCommonSettings settings, IAuth auth, string cs
         protected override HttpWebRequest CreateRequest(string baseDomain = null)
         {
             var request = base.CreateRequest("https://passport.yandex.ru");
+
+            request.Headers.Add("sec-ch-ua", "\" Not A; Brand\";v=\"99\", \"Chromium\";v=\"99\", \"Google Chrome\";v=\"99\"");
+            request.Headers.Add("Accept", "application/json, text/javascript, */*; q=0.01");
+            request.Headers.Add("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
+            request.Headers.Add("X-Requested-With", "XMLHttpRequest");
+            request.Headers.Add("sec-ch-ua-mobile", "?0");
+            request.Headers.Add("sec-ch-ua-platform", "\"Windows\"");
+            request.Headers.Add("Origin", "https://passport.yandex.ru");
+            request.Headers.Add("Sec-Fetch-Site", "same-origin");
+            request.Headers.Add("Sec-Fetch-Mode", "cors");
+            request.Headers.Add("Sec-Fetch-Dest", "empty");
+            request.Headers.Add("Referer", "https://passport.yandex.ru/");
+            request.Headers.Add("Accept-Encoding", "gzip, deflate, br");
+            request.Headers.Add("Accept-Language", "ru-RU,ru;q=0.9,en-US;q=0.8,en;q=0.7,es;q=0.6");
+
             return request;
         }
 
         protected override byte[] CreateHttpContent()
         {
             var keyValues = new List<KeyValuePair<string, string>>
             {
-                new KeyValuePair<string, string>("csrf_token", _csrf),
+                new KeyValuePair<string, string>("csrf_token", Uri.EscapeUriString(_csrf)),
                 new KeyValuePair<string, string>("track_id", _trackId),
-                new KeyValuePair<string, string>("password", _auth.Password),
-                new KeyValuePair<string, string>("retpath", "https://disk.yandex.ru/client/disk")
+                new KeyValuePair<string, string>("password", Uri.EscapeUriString(_auth.Password)),
+                new KeyValuePair<string, string>("retpath", Uri.EscapeUriString("https://disk.yandex.ru/client/disk"))
             };
             var content = new FormUrlEncodedContent(keyValues);
             var d = content.ReadAsByteArrayAsync().Result;
@@ -49,6 +65,9 @@ protected override RequestResponse<YadAuthPasswordRequestResult> DeserializeMess
         {
             var res = base.DeserializeMessage(responseHeaders, stream);
 
+            if (res.Result.State == "auth_challenge")
+                throw new AuthenticationException("Browser login required to accept additional confirmations");
+
             var uid = responseHeaders["X-Default-UID"];
             if (string.IsNullOrWhiteSpace(uid))
                 throw new AuthenticationException("Cannot get X-Default-UID");
@@ -65,6 +84,9 @@ class YadAuthPasswordRequestResult
         [JsonProperty("status")]
         public string Status { get; set; }
 
+        [JsonProperty("state")]
+        public string State { get; set; }
+
         [JsonProperty("retpath")]
         public string RetPath { get; set; }
 

diff --git a/MailRuCloud/MailRuCloudApi/YaR.Clouds.csproj b/MailRuCloud/MailRuCloudApi/YaR.Clouds.csproj
@@ -7,8 +7,8 @@
     <TargetFrameworks>$(CommonTargetFrameworks)</TargetFrameworks>
     <RootNamespace>YaR.Clouds</RootNamespace>
     <AssemblyName>YaR.Clouds</AssemblyName>
-    <AssemblyVersion>1.13.5.0</AssemblyVersion>
-    <FileVersion>1.13.5.0</FileVersion>
+    <AssemblyVersion>1.13.5.1</AssemblyVersion>
+    <FileVersion>1.13.5.1</FileVersion>
     <Version>$(AssemblyVersion)</Version>
     <LangVersion>preview</LangVersion>
   </PropertyGroup>

diff --git a/WDMRC.Console/WDMRC.Console.csproj b/WDMRC.Console/WDMRC.Console.csproj
@@ -15,8 +15,8 @@
     <Copyright>yar229@yandex.ru</Copyright>
     <Description>WebDAV emulator for Cloud.mail.ru</Description>
     <PackageId>WebDAVCloudMailRu</PackageId>
-    <AssemblyVersion>1.13.5.0</AssemblyVersion>
-    <FileVersion>1.13.5.0</FileVersion>
+    <AssemblyVersion>1.13.5.1</AssemblyVersion>
+    <FileVersion>1.13.5.1</FileVersion>
     <Version>$(AssemblyVersion)</Version>
     <AssemblyName>wdmrc</AssemblyName>
     <RootNamespace>YaR.Clouds.Console</RootNamespace>