-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into issues-long
- Loading branch information
Showing
30 changed files
with
492 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -105,4 +105,7 @@ tools/* | |
| coverage-results/* | ||
|
|
||
| # Rider | ||
| **/.idea/* | ||
| **/.idea/* | ||
|
|
||
| # macOS | ||
| .DS_Store | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| using System; | ||
|
|
||
| namespace Octokit.Reactive | ||
| { | ||
| /// <summary> | ||
| /// A client for GitHub's meta public keys API. | ||
| /// </summary> | ||
| /// <remarks> | ||
| /// See the <a href="https://docs.github.com/code-security/secret-scanning/secret-scanning-partner-program#implement-signature-verification-in-your-secret-alert-service">Secret scanning documentation</a> for more details. | ||
| /// </remarks> | ||
| public interface IObservablePublicKeysClient | ||
| { | ||
| /// <summary> | ||
| /// Retrieves public keys for validating request signatures. | ||
| /// </summary> | ||
| /// <exception cref="ApiException">Thrown when a general API error occurs.</exception> | ||
| /// <returns>An <see cref="MetaPublicKeys"/> containing public keys for validating request signatures.</returns> | ||
| IObservable<MetaPublicKeys> Get(PublicKeyType keysType); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| using System; | ||
| using System.Reactive.Linq; | ||
| using System.Reactive.Threading.Tasks; | ||
|
|
||
| namespace Octokit.Reactive | ||
| { | ||
| /// <summary> | ||
| /// A client for GitHub's public keys API. | ||
| /// </summary> | ||
| /// <remarks> | ||
| /// See the <a href="https://docs.github.com/code-security/secret-scanning/secret-scanning-partner-program#implement-signature-verification-in-your-secret-alert-service">Secret scanning documentation</a> for more details. | ||
| /// </remarks> | ||
| public class ObservablePublicKeysClient : IObservablePublicKeysClient | ||
| { | ||
| private readonly IPublicKeysClient _client; | ||
|
|
||
| public ObservablePublicKeysClient(IGitHubClient client) | ||
| { | ||
| Ensure.ArgumentNotNull(client, nameof(client)); | ||
|
|
||
| _client = client.Meta.PublicKeys; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Retrieves public keys for validating request signatures. | ||
| /// </summary> | ||
| /// <exception cref="ApiException">Thrown when a general API error occurs.</exception> | ||
| /// <returns>An <see cref="MetaPublicKeys"/> containing public keys for validating request signatures.</returns> | ||
| public IObservable<MetaPublicKeys> Get(PublicKeyType keysType) | ||
| { | ||
| return _client.Get(keysType).ToObservable(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| using System.Threading.Tasks; | ||
| using Xunit; | ||
|
|
||
| namespace Octokit.Tests.Integration.Clients | ||
| { | ||
| public class PublicKeysClientTests | ||
| { | ||
| public class TheGetMethod | ||
| { | ||
| [IntegrationTest] | ||
| public async Task CanRetrievePublicKeys() | ||
| { | ||
| var github = Helper.GetAnonymousClient(); | ||
|
|
||
| var result = await github.Meta.PublicKeys.Get(PublicKeyType.SecretScanning); | ||
|
|
||
| Assert.NotNull(result); | ||
| Assert.Equal(2, result.PublicKeys.Count); | ||
|
|
||
| Assert.NotNull(result.PublicKeys[0].KeyIdentifier); | ||
| Assert.NotNull(result.PublicKeys[0].Key); | ||
|
|
||
| Assert.NotNull(result.PublicKeys[1].KeyIdentifier); | ||
| Assert.NotNull(result.PublicKeys[1].Key); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| using System; | ||
| using System.Threading.Tasks; | ||
| using NSubstitute; | ||
| using Xunit; | ||
|
|
||
| namespace Octokit.Tests.Clients | ||
| { | ||
| public class PublicKeysClientTests | ||
| { | ||
| public class TheCtor | ||
| { | ||
| [Fact] | ||
| public void EnsuresNonNullArguments() | ||
| { | ||
| Assert.Throws<ArgumentNullException>(() => new PublicKeysClient(null)); | ||
| } | ||
| } | ||
|
|
||
| public class TheGetMethod | ||
| { | ||
| [Fact] | ||
| public async Task RequestsTheCorrectUrl() | ||
| { | ||
| var connection = Substitute.For<IApiConnection>(); | ||
| var client = new PublicKeysClient(connection); | ||
|
|
||
| await client.Get(PublicKeyType.CopilotApi); | ||
|
|
||
| connection.Received() | ||
| .Get<MetaPublicKeys>(Arg.Is<Uri>(u => u.ToString() == "meta/public_keys/copilot_api")); | ||
| } | ||
|
|
||
| [Fact] | ||
| public async Task RequestsCopilotApiPublicKeysEndpoint() | ||
| { | ||
| var publicKeys = new MetaPublicKeys(publicKeys: new[] { | ||
| new MetaPublicKey("4fe6b016179b74078ade7581abf4e84fb398c6fae4fb973972235b84fcd70ca3", "-----BEGIN PUBLIC KEY-----\nMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAELPuPiLVQbHY/clvpNnY+0BzYIXgo\nS0+XhEkTWUZEEznIVpS3rQseDTG6//gEWr4j9fY35+dGOxwOx3Z9mK3i7w==\n-----END PUBLIC KEY-----\n", true), | ||
| new MetaPublicKey("df3454252d91570ae1bc597182d1183c7a8d42ff0ae96e0f2be4ba278d776546", "-----BEGIN PUBLIC KEY-----\nMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEl5xbyr5bmETCJzqAvDnYl1ZKJrkf\n89Nyq5j06TTKrnHXXDw4FYNY1uF2S/w6EOaxbf9BxOidCLvjJ8ZgKzNpww==\n-----END PUBLIC KEY-----\n", false) | ||
| }); | ||
|
|
||
| var apiConnection = Substitute.For<IApiConnection>(); | ||
| apiConnection.Get<MetaPublicKeys>(Arg.Is<Uri>(u => u.ToString() == "meta/public_keys/copilot_api")).Returns(Task.FromResult(publicKeys)); | ||
|
|
||
| var client = new PublicKeysClient(apiConnection); | ||
|
|
||
| var result = await client.Get(PublicKeyType.CopilotApi); | ||
|
|
||
| Assert.Equal(2, result.PublicKeys.Count); | ||
| Assert.Equal("4fe6b016179b74078ade7581abf4e84fb398c6fae4fb973972235b84fcd70ca3", result.PublicKeys[0].KeyIdentifier); | ||
| Assert.Equal("-----BEGIN PUBLIC KEY-----\nMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAELPuPiLVQbHY/clvpNnY+0BzYIXgo\nS0+XhEkTWUZEEznIVpS3rQseDTG6//gEWr4j9fY35+dGOxwOx3Z9mK3i7w==\n-----END PUBLIC KEY-----\n", result.PublicKeys[0].Key); | ||
| Assert.True(result.PublicKeys[0].IsCurrent); | ||
|
|
||
| Assert.Equal("df3454252d91570ae1bc597182d1183c7a8d42ff0ae96e0f2be4ba278d776546", result.PublicKeys[1].KeyIdentifier); | ||
| Assert.Equal("-----BEGIN PUBLIC KEY-----\nMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEl5xbyr5bmETCJzqAvDnYl1ZKJrkf\n89Nyq5j06TTKrnHXXDw4FYNY1uF2S/w6EOaxbf9BxOidCLvjJ8ZgKzNpww==\n-----END PUBLIC KEY-----\n", result.PublicKeys[1].Key); | ||
| Assert.False(result.PublicKeys[1].IsCurrent); | ||
|
|
||
| apiConnection.Received() | ||
| .Get<MetaPublicKeys>(Arg.Is<Uri>(u => u.ToString() == "meta/public_keys/copilot_api")); | ||
| } | ||
|
|
||
| [Fact] | ||
| public async Task RequestSecretScanningPublicKeysEndpoint() | ||
| { | ||
| var publicKeys = new MetaPublicKeys(publicKeys: new[] { | ||
| new MetaPublicKey("90a421169f0a406205f1563a953312f0be898d3c7b6c06b681aa86a874555f4a", "-----BEGIN PUBLIC KEY-----\nMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE9MJJHnMfn2+H4xL4YaPDA4RpJqUq\nkCmRCBnYERxZanmcpzQSXs1X/AljlKkbJ8qpVIW4clayyef9gWhFbNHWAA==\n-----END PUBLIC KEY-----\n", false), | ||
| new MetaPublicKey("bcb53661c06b4728e59d897fb6165d5c9cda0fd9cdf9d09ead458168deb7518c", "-----BEGIN PUBLIC KEY-----\nMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEYAGMWO8XgCamYKMJS6jc/qgvSlAd\nAjPuDPRcXU22YxgBrz+zoN19MzuRyW87qEt9/AmtoNP5GrobzUvQSyJFVw==\n-----END PUBLIC KEY-----\n", true) | ||
| }); | ||
|
|
||
| var apiConnection = Substitute.For<IApiConnection>(); | ||
| apiConnection.Get<MetaPublicKeys>(Arg.Is<Uri>(u => u.ToString() == "meta/public_keys/secret_scanning")).Returns(Task.FromResult(publicKeys)); | ||
|
|
||
| var client = new PublicKeysClient(apiConnection); | ||
|
|
||
| var result = await client.Get(PublicKeyType.SecretScanning); | ||
|
|
||
| Assert.Equal(2, result.PublicKeys.Count); | ||
| Assert.Equal("90a421169f0a406205f1563a953312f0be898d3c7b6c06b681aa86a874555f4a", result.PublicKeys[0].KeyIdentifier); | ||
| Assert.Equal("-----BEGIN PUBLIC KEY-----\nMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE9MJJHnMfn2+H4xL4YaPDA4RpJqUq\nkCmRCBnYERxZanmcpzQSXs1X/AljlKkbJ8qpVIW4clayyef9gWhFbNHWAA==\n-----END PUBLIC KEY-----\n", result.PublicKeys[0].Key); | ||
| Assert.False(result.PublicKeys[0].IsCurrent); | ||
|
|
||
| Assert.Equal("bcb53661c06b4728e59d897fb6165d5c9cda0fd9cdf9d09ead458168deb7518c", result.PublicKeys[1].KeyIdentifier); | ||
| Assert.Equal("-----BEGIN PUBLIC KEY-----\nMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEYAGMWO8XgCamYKMJS6jc/qgvSlAd\nAjPuDPRcXU22YxgBrz+zoN19MzuRyW87qEt9/AmtoNP5GrobzUvQSyJFVw==\n-----END PUBLIC KEY-----\n", result.PublicKeys[1].Key); | ||
| Assert.True(result.PublicKeys[1].IsCurrent); | ||
|
|
||
| apiConnection.Received() | ||
| .Get<MetaPublicKeys>(Arg.Is<Uri>(u => u.ToString() == "meta/public_keys/secret_scanning")); | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.