Merge branch 'main' into elinor/add-kiota-workspace

Author: ElinorW

.github/policies/resourceManagement.yml

@@ -1,37 +1,37 @@
-id: 
+id:
 name: GitOps.PullRequestIssueManagement
 description: GitOps.PullRequestIssueManagement primitive
-owner: 
+owner:
 resource: repository
 disabled: false
-where: 
+where:
 configuration:
   resourceManagementConfiguration:
     scheduledSearches:
-    - description: 
+    - description:
       frequencies:
       - hourly:
           hour: 6
       filters:
       - isIssue
       - isOpen
       - hasLabel:
-          label: 'Needs: Author Feedback'
+          label: 'status:waiting-for-author-feedback'
       - hasLabel:
           label: 'Status: No Recent Activity'
       - noActivitySince:
           days: 3
       actions:
       - closeIssue
-    - description: 
+    - description:
       frequencies:
       - hourly:
           hour: 6
       filters:
       - isIssue
       - isOpen
       - hasLabel:
-          label: 'Needs: Author Feedback'
+          label: 'status:waiting-for-author-feedback'
       - noActivitySince:
           days: 4
       - isNotLabeledWith:
@@ -41,7 +41,7 @@ configuration:
           label: 'Status: No Recent Activity'
       - addReply:
           reply: This issue has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for **4 days**. It will be closed if no further activity occurs **within 3 days of this comment**.
-    - description: 
+    - description:
       frequencies:
       - hourly:
           hour: 6
@@ -64,14 +64,14 @@ configuration:
       - isActivitySender:
           issueAuthor: True
       - hasLabel:
-          label: 'Needs: Author Feedback'
+          label: 'status:waiting-for-author-feedback'
       - isOpen
       then:
       - addLabel:
           label: 'Needs: Attention :wave:'
       - removeLabel:
-          label: 'Needs: Author Feedback'
-      description: 
+          label: 'status:waiting-for-author-feedback'
+      description:
     - if:
       - payloadType: Issues
       - not:
@@ -82,20 +82,20 @@ configuration:
       then:
       - removeLabel:
           label: 'Status: No Recent Activity'
-      description: 
+      description:
     - if:
       - payloadType: Issue_Comment
       - hasLabel:
           label: 'Status: No Recent Activity'
       then:
       - removeLabel:
           label: 'Status: No Recent Activity'
-      description: 
+      description:
     - if:
       - payloadType: Pull_Request
       then:
       - inPrLabel:
           label: WIP
-      description: 
-onFailure: 
-onSuccess: 
+      description:
+onFailure:
+onSuccess:

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added support for multipart form data request body in PHP. [#3029](https://github.com/microsoft/kiota/issues/3029)
 - Added uri-form encoded serialization for PHP. [#2074](https://github.com/microsoft/kiota/issues/2074)
 - Added information message with base URL in the CLI experience. [#4635](https://github.com/microsoft/kiota/issues/4635)
+- Added optional parameter --disable-ssl-validation for generate, show, and download commands. [#4176](https://github.com/microsoft/kiota/issues/4176)
 
 ### Changed
 

it/python/requirements-dev.txt

@@ -1,6 +1,6 @@
 -i https://pypi.org/simple
 
-astroid==3.2.1 ; python_full_version >= '3.7.2'
+astroid==3.2.2 ; python_full_version >= '3.7.2'
 
 certifi==2024.2.2 ; python_version >= '3.6'
 
@@ -40,11 +40,11 @@ platformdirs==4.2.2 ; python_version >= '3.7'
 
 pluggy==1.5.0 ; python_version >= '3.7'
 
-pylint==3.2.0
+pylint==3.2.2
 
-pytest==8.2.0
+pytest==8.2.1
 
-pytest-asyncio==0.23.6
+pytest-asyncio==0.23.7
 
 requests==2.31.0 ; python_version >= '3.7'
 

src/Kiota.Builder/Configuration/DownloadConfiguration.cs

@@ -9,14 +9,19 @@ public bool CleanOutput
     {
         get; set;
     }
+    public bool DisableSSLValidation
+    {
+        get; set;
+    }
 
     public object Clone()
     {
         return new DownloadConfiguration
         {
             OutputPath = OutputPath,
             CleanOutput = CleanOutput,
-            ClearCache = ClearCache
+            ClearCache = ClearCache,
+            DisableSSLValidation = DisableSSLValidation,
         };
     }
 }

src/Kiota.Builder/Configuration/GenerationConfiguration.cs

@@ -151,6 +151,7 @@ public object Clone()
             Operation = Operation,
             PatternsOverride = new(PatternsOverride ?? Enumerable.Empty<string>(), StringComparer.OrdinalIgnoreCase),
             PluginTypes = new(PluginTypes ?? Enumerable.Empty<PluginType>()),
+            DisableSSLValidation = DisableSSLValidation,
         };
     }
     private static readonly StringIEnumerableDeepComparer comparer = new();
@@ -200,6 +201,11 @@ private string NormalizeDescriptionLocation(string targetDirectory)
         return OpenAPIFilePath;
     }
     public bool IsPluginConfiguration => PluginTypes.Count != 0;
+
+    public bool DisableSSLValidation
+    {
+        get; set;
+    }
 }
 #pragma warning restore CA1056
 #pragma warning restore CA2227

src/Kiota.Builder/Lock/KiotaLock.cs

@@ -59,6 +59,13 @@ public bool IncludeAdditionalData
     {
         get; set;
     }
+    /// <summary>
+    /// Whether SSL Validation was disabled for this client.
+    /// </summary>
+    public bool DisableSSLValidation
+    {
+        get; set;
+    }
 #pragma warning disable CA2227
     /// <summary>
     /// The serializers used for this client.
@@ -108,6 +115,7 @@ public void UpdateGenerationConfigurationFromLock(GenerationConfiguration config
         config.ExcludePatterns = ExcludePatterns;
         config.OpenAPIFilePath = DescriptionLocation;
         config.DisabledValidationRules = DisabledValidationRules;
+        config.DisableSSLValidation = DisableSSLValidation;
     }
     /// <summary>
     /// Initializes a new instance of the <see cref="KiotaLock"/> class.
@@ -135,5 +143,6 @@ public KiotaLock(GenerationConfiguration config)
         ExcludePatterns = config.ExcludePatterns;
         DescriptionLocation = config.OpenAPIFilePath;
         DisabledValidationRules = config.DisabledValidationRules;
+        DisableSSLValidation = config.DisableSSLValidation;
     }
 }

src/Kiota.Builder/Lock/KiotaLockComparer.cs

@@ -21,6 +21,7 @@ public int GetHashCode([DisallowNull] KiotaLock obj)
     {
         if (obj == null) return 0;
         return
+            obj.DisableSSLValidation.GetHashCode() * 59 +
             _stringIEnumerableDeepComparer.GetHashCode(obj.DisabledValidationRules?.Order(StringComparer.OrdinalIgnoreCase) ?? Enumerable.Empty<string>()) * 53 +
             obj.KiotaVersion.GetHashCode(StringComparison.OrdinalIgnoreCase) * 47 +
             obj.LockFileVersion.GetHashCode(StringComparison.OrdinalIgnoreCase) * 43 +

src/Kiota.Builder/SearchProviders/GitHub/GitHubClient/kiota-lock.json

@@ -37,5 +37,6 @@
     "**/generate",
     "**/repos/**/topics"
   ],
-  "disabledValidationRules": []
-}
+  "disabledValidationRules": [],
+  "disableSSLValidation": false
+}

src/kiota/Handlers/BaseKiotaCommandHandler.cs

@@ -31,7 +31,16 @@ protected static void DefaultSerializersAndDeserializers(GenerationConfiguration
         Logger = logger,
         FileName = "pat-api.github.com"
     };
-    internal static readonly HttpClient httpClient = new();
+
+    private HttpClient? _httpClient;
+    protected HttpClient httpClient
+    {
+        get
+        {
+            _httpClient ??= GetHttpClient();
+            return _httpClient;
+        }
+    }
     public required Option<LogLevel> LogLevelOption
     {
         get; init;
@@ -52,6 +61,21 @@ protected KiotaConfiguration Configuration
         configObject.BindConfiguration(configuration);
         return configObject;
     });
+
+    protected HttpClient GetHttpClient()
+    {
+        var httpClientHandler = new HttpClientHandler();
+        if (Configuration.Generation.DisableSSLValidation)
+            httpClientHandler.ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator;
+
+        var httpClient = new HttpClient(httpClientHandler);
+
+        disposables.Add(httpClientHandler);
+        disposables.Add(httpClient);
+
+        return httpClient;
+    }
+
     private const string GitHubScope = "repo";
     private Func<CancellationToken, Task<bool>> GetIsGitHubDeviceSignedInCallback(ILogger logger) => (cancellationToken) =>
     {

src/kiota/Handlers/KiotaDownloadCommandHandler.cs

@@ -31,16 +31,22 @@ public required Option<bool> CleanOutputOption
     {
         get; init;
     }
+    public required Option<bool> DisableSSLValidationOption
+    {
+        get; init;
+    }
     public override async Task<int> InvokeAsync(InvocationContext context)
     {
         string searchTerm = context.ParseResult.GetValueForArgument(SearchTermArgument);
         string version = context.ParseResult.GetValueForOption(VersionOption) ?? string.Empty;
         string outputPath = context.ParseResult.GetValueForOption(OutputPathOption) ?? string.Empty;
         bool cleanOutput = context.ParseResult.GetValueForOption(CleanOutputOption);
         bool clearCache = context.ParseResult.GetValueForOption(ClearCacheOption);
+        bool disableSSLValidation = context.ParseResult.GetValueForOption(DisableSSLValidationOption);
         CancellationToken cancellationToken = context.BindingContext.GetService(typeof(CancellationToken)) is CancellationToken token ? token : CancellationToken.None;
 
         Configuration.Download.ClearCache = clearCache;
+        Configuration.Download.DisableSSLValidation = disableSSLValidation;
         Configuration.Download.CleanOutput = cleanOutput;
         Configuration.Download.OutputPath = NormalizeSlashesInPath(outputPath);