Merge branch 'develop2'

.editorconfig

@@ -0,0 +1,228 @@
+# Remove the line below if you want to inherit .editorconfig settings from higher directories
+root = true
+
+# C# files
+[*.cs]
+
+#### Core EditorConfig Options ####
+
+# Indentation and spacing
+indent_size = 4
+indent_style = space
+tab_width = 4
+
+# New line preferences
+end_of_line = lf
+insert_final_newline = false
+
+#### .NET Coding Conventions ####
+
+# Organize usings
+dotnet_separate_import_directive_groups = false
+dotnet_sort_system_directives_first = true
+file_header_template = unset
+
+# this. and Me. preferences
+dotnet_style_qualification_for_event = false
+dotnet_style_qualification_for_field = false
+dotnet_style_qualification_for_method = false
+dotnet_style_qualification_for_property = false
+
+# Language keywords vs BCL types preferences
+dotnet_style_predefined_type_for_locals_parameters_members = true
+dotnet_style_predefined_type_for_member_access = true
+
+# Parentheses preferences
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity
+
+# Modifier preferences
+dotnet_style_require_accessibility_modifiers = for_non_interface_members
+
+# Expression-level preferences
+dotnet_style_coalesce_expression = true
+dotnet_style_collection_initializer = true:silent
+dotnet_style_explicit_tuple_names = true:silent
+dotnet_style_namespace_match_folder = true
+dotnet_style_null_propagation = true:warning
+dotnet_style_object_initializer = true:silent
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+dotnet_style_prefer_auto_properties = true
+dotnet_style_prefer_compound_assignment = true
+dotnet_style_prefer_conditional_expression_over_assignment = true
+dotnet_style_prefer_conditional_expression_over_return = true
+dotnet_style_prefer_foreach_explicit_cast_in_source = when_strongly_typed
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:silent
+dotnet_style_prefer_inferred_tuple_names = true
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true
+dotnet_style_prefer_simplified_boolean_expressions = true:silent
+dotnet_style_prefer_simplified_interpolation = true
+
+# Field preferences
+dotnet_style_readonly_field = true
+
+# Parameter preferences
+dotnet_code_quality_unused_parameters = all
+
+# Suppression preferences
+dotnet_remove_unnecessary_suppression_exclusions = 0
+
+# New line preferences
+dotnet_style_allow_multiple_blank_lines_experimental = true
+dotnet_style_allow_statement_immediately_after_block_experimental = true
+
+#### C# Coding Conventions ####
+
+# var preferences
+csharp_style_var_elsewhere = false
+csharp_style_var_for_built_in_types = false
+csharp_style_var_when_type_is_apparent = false
+
+# Expression-bodied members
+csharp_style_expression_bodied_accessors = true
+csharp_style_expression_bodied_constructors = false
+csharp_style_expression_bodied_indexers = true
+csharp_style_expression_bodied_lambdas = true
+csharp_style_expression_bodied_local_functions = false
+csharp_style_expression_bodied_methods = when_on_single_line
+csharp_style_expression_bodied_operators = false
+csharp_style_expression_bodied_properties = true
+
+# Pattern matching preferences
+csharp_style_pattern_matching_over_as_with_null_check = true
+csharp_style_pattern_matching_over_is_with_cast_check = true
+csharp_style_prefer_extended_property_pattern = true
+csharp_style_prefer_not_pattern = true
+csharp_style_prefer_pattern_matching = true
+csharp_style_prefer_switch_expression = true:silent
+
+# Null-checking preferences
+csharp_style_conditional_delegate_call = true
+
+# Modifier preferences
+csharp_prefer_static_local_function = true
+csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async
+csharp_style_prefer_readonly_struct = true
+
+# Code-block preferences
+csharp_prefer_braces = true
+csharp_prefer_simple_using_statement = true
+csharp_style_namespace_declarations = block_scoped
+csharp_style_prefer_method_group_conversion = true
+csharp_style_prefer_top_level_statements = true
+
+# Expression-level preferences
+csharp_prefer_simple_default_expression = true:silent
+csharp_style_deconstructed_variable_declaration = true
+csharp_style_implicit_object_creation_when_type_is_apparent = false:silent
+csharp_style_inlined_variable_declaration = true:silent
+csharp_style_prefer_index_operator = true:silent
+csharp_style_prefer_local_over_anonymous_function = true:silent
+csharp_style_prefer_null_check_over_type_check = true
+csharp_style_prefer_range_operator = true:silent
+csharp_style_prefer_tuple_swap = true:silent
+csharp_style_prefer_utf8_string_literals = true
+csharp_style_throw_expression = true
+csharp_style_unused_value_assignment_preference = unused_local_variable:warning
+csharp_style_unused_value_expression_statement_preference = unused_local_variable
+
+# 'using' directive preferences
+csharp_using_directive_placement = outside_namespace
+
+# New line preferences
+csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true
+csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true
+csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true
+csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true
+csharp_style_allow_embedded_statements_on_same_line_experimental = true
+
+#### C# Formatting Rules ####
+
+# New line preferences
+csharp_new_line_before_catch = true
+csharp_new_line_before_else = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_open_brace = all
+csharp_new_line_between_query_expression_clauses = true
+
+# Indentation preferences
+csharp_indent_block_contents = true
+csharp_indent_braces = false
+csharp_indent_case_contents = true
+csharp_indent_case_contents_when_block = true
+csharp_indent_labels = one_less_than_current
+csharp_indent_switch_labels = false
+
+# Space preferences
+csharp_space_after_cast = false
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_after_comma = true
+csharp_space_after_dot = false
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_after_semicolon_in_for_statement = true
+csharp_space_around_binary_operators = true
+csharp_space_around_declaration_statements = false
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_before_comma = false
+csharp_space_before_dot = false
+csharp_space_before_open_square_brackets = false
+csharp_space_before_semicolon_in_for_statement = false
+csharp_space_between_empty_square_brackets = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_declaration_name_and_open_parenthesis = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_parentheses = false
+csharp_space_between_square_brackets = false
+
+# Wrapping preferences
+csharp_preserve_single_line_blocks = true
+csharp_preserve_single_line_statements = true
+
+#### Naming styles ####
+
+# Naming rules
+
+dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
+dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
+dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
+
+dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.types_should_be_pascal_case.symbols = types
+dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
+
+dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
+dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
+
+# Symbol specifications
+
+dotnet_naming_symbols.interface.applicable_kinds = interface
+dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.interface.required_modifiers = 
+
+dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
+dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.types.required_modifiers = 
+
+dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
+dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.non_field_members.required_modifiers = 
+
+# Naming styles
+
+dotnet_naming_style.pascal_case.required_prefix = 
+dotnet_naming_style.pascal_case.required_suffix = 
+dotnet_naming_style.pascal_case.word_separator = 
+dotnet_naming_style.pascal_case.capitalization = pascal_case
+
+dotnet_naming_style.begins_with_i.required_prefix = I
+dotnet_naming_style.begins_with_i.required_suffix = 
+dotnet_naming_style.begins_with_i.word_separator = 
+dotnet_naming_style.begins_with_i.capitalization = pascal_case

Common.targets

@@ -2,7 +2,7 @@
 	<PropertyGroup>
 
 		<!--<CommonTargetFrameworks>netcoreapp3.1;net48;net5.0</CommonTargetFrameworks>-->
-    <CommonTargetFrameworks>netcoreapp3.1;net48;net5.0;net6.0</CommonTargetFrameworks>
+		<CommonTargetFrameworks>net7.0-windows;net48;netcoreapp3.1;net5.0;net6.0;net7.0</CommonTargetFrameworks>
 
 		<CommonLangVersion>latest</CommonLangVersion>
 	</PropertyGroup>

Hasher/Hasher.csproj

@@ -6,12 +6,14 @@
     <NoWarn>$(NoWarn);NU1605</NoWarn>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>$(CommonTargetFrameworks)</TargetFrameworks>
-    <DefineConstants>TRACE;RELEASE;NETCOREAPP3_0</DefineConstants>
+    <CheckEolTargetFramework>false</CheckEolTargetFramework>
+    <DefineConstants>$(DefineConstants);TRACE;RELEASE;NETCOREAPP3_0</DefineConstants>
     <Authors>YaR</Authors>
     <Company />
     <Product>WebDAVCloudMailRu</Product>
     <Copyright>[email protected]</Copyright>
     <Description>Hash calculator</Description>
+    <RunAnalyzersDuringBuild>False</RunAnalyzersDuringBuild>
   </PropertyGroup>
 
   <ItemGroup>

LICENSE.txt

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 YaR
+Copyright (c) 2023 YaR
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

MailRuCloud/MailRuCloudApi/Base/CryptoUtil.cs

@@ -7,14 +7,22 @@ public static class CryptoUtil
     {
         public static byte[] GetCryptoKey(string password, byte[] salt)
         {
+#if NET7_0_OR_GREATER
+            using var keygen = new Rfc2898DeriveBytes(password, salt, 4002, HashAlgorithmName.SHA512);
+#else
             using var keygen = new Rfc2898DeriveBytes(password, salt, 4002);
+#endif
             var key = keygen.GetBytes(32);
             return key;
         }
 
         public static KeyAndSalt GetCryptoKeyAndSalt(string password, int saltSize = SaltSizeInBytes)
         {
+#if NET7_0_OR_GREATER
+            using var keygen = new Rfc2898DeriveBytes(password, saltSize, 4002, HashAlgorithmName.SHA512);
+#else
             using var keygen = new Rfc2898DeriveBytes(password, saltSize, 4002);
+#endif
             var res = new KeyAndSalt
             {
                 Salt = keygen.Salt,

MailRuCloud/MailRuCloudApi/Base/Protocol.cs

@@ -4,6 +4,7 @@ public enum Protocol
     {
         WebM1Bin,
         WebV2,
-        YadWeb
+        YadWeb,
+        YadWebV2
     }
 }

MailRuCloud/MailRuCloudApi/Base/Repos/RepoFabric.cs

@@ -1,7 +1,6 @@
 using System;
 using YaR.Clouds.Base.Repos.MailRuCloud.WebBin;
 using YaR.Clouds.Base.Repos.MailRuCloud.WebV2;
-using YaR.Clouds.Base.Repos.YandexDisk.YadWeb;
 
 namespace YaR.Clouds.Base.Repos
 {
@@ -30,7 +29,8 @@ string TwoFaHandler(string login, bool isAutoRelogin)
 
             IRequestRepo repo = _settings.Protocol switch
             {
-                Protocol.YadWeb => new YadWebRequestRepo(_settings.Proxy, _credentials),
+                Protocol.YadWebV2 => new YandexDisk.YadWebV2.YadWebRequestRepo(_settings, _settings.Proxy, _credentials),
+                Protocol.YadWeb => new YandexDisk.YadWeb.YadWebRequestRepo(_settings, _settings.Proxy, _credentials),
                 Protocol.WebM1Bin => new WebBinRequestRepo(_settings, _credentials, TwoFaHandler),
                 Protocol.WebV2 => new WebV2RequestRepo(_settings, _credentials, TwoFaHandler),
                 _ => throw new Exception("Unknown protocol")

MailRuCloud/MailRuCloudApi/Base/Repos/YandexDisk/YadWeb/Models/GetResourceUrl.cs

@@ -17,8 +17,10 @@ public override IEnumerable<KeyValuePair<string, string>> ToKvp(int index)
         {
             foreach (var pair in base.ToKvp(index))
                 yield return pair;
-
-            yield return new KeyValuePair<string, string>($"id.{index}", WebDavPath.Combine("/disk", Path));
+
+            //yield return new KeyValuePair<string, string>($"id.{index}", WebDavPath.Combine("/disk", Path));
+            // 08.07.2023 в браузере при скачивании: "idResource.0"
+            yield return new KeyValuePair<string, string>($"idResource.{index}", WebDavPath.Combine("/disk", Path));
         }
     }
 

MailRuCloud/MailRuCloudApi/Base/Repos/YandexDisk/YadWeb/YadWebRequestRepo.cs

@@ -27,10 +27,22 @@ class YadWebRequestRepo : IRequestRepo
 
         private readonly IBasicCredentials _creds;
 
-        public YadWebRequestRepo(IWebProxy proxy, IBasicCredentials creds)
+        public YadWebRequestRepo(CloudSettings settings, IWebProxy proxy, IBasicCredentials creds)
         {
             ServicePointManager.DefaultConnectionLimit = int.MaxValue;
 
+            HttpSettings = new()
+            {
+                /*
+                 * Оригинальная версия содержит именно такую инициализацию.
+                 * Есть вероятность, что для этого user-agent Яндекс не выпендривается
+                 * и не начинает принудительно переводить на вход по СМС.
+                 */
+                UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36",
+                //UserAgent = settings.UserAgent,
+                CloudSettings = settings,
+            };
+
             HttpSettings.Proxy = proxy;
             _creds = creds;
         }
@@ -53,10 +65,13 @@ private async Task<Dictionary<string, IEnumerable<PublicLinkInfo>>> GetShareList
 
         public IAuth Authent => CachedAuth.Value;
 
-        private Cached<YadWebAuth> CachedAuth => _cachedAuth ??= new Cached<YadWebAuth>(_ => new YadWebAuth(HttpSettings, _creds), _ => TimeSpan.FromHours(23));
+        private Cached<YadWebAuth> CachedAuth => _cachedAuth ??=
+                new Cached<YadWebAuth>(_ => new YadWebAuth(HttpSettings, _creds), _ => TimeSpan.FromHours(23));
         private Cached<YadWebAuth> _cachedAuth;
 
-        public Cached<Dictionary<string, IEnumerable<PublicLinkInfo>>> CachedSharedList => _cachedSharedList ??= new Cached<Dictionary<string, IEnumerable<PublicLinkInfo>>>(_ =>
+        public Cached<Dictionary<string, IEnumerable<PublicLinkInfo>>> CachedSharedList
+            => _cachedSharedList ??= new Cached<Dictionary<string, IEnumerable<PublicLinkInfo>>>(
+                _ =>
                     {
                         var res = GetShareListInner().Result;
                         return res;
@@ -65,10 +80,7 @@ private async Task<Dictionary<string, IEnumerable<PublicLinkInfo>>> GetShareList
         private Cached<Dictionary<string, IEnumerable<PublicLinkInfo>>> _cachedSharedList;
 
 
-        public HttpCommonSettings HttpSettings { get; } = new()
-        {
-            UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36"
-        };
+        public HttpCommonSettings HttpSettings { get; private set; }
 
         public Stream GetDownloadStream(File afile, long? start = null, long? end = null)
         {