Skip to content

Commit dc409d9

Browse files
inikulshinIlya Nikulshin
inikulshin
and
Ilya Nikulshin
authored
Support /api/user-limits and UserInfo.HashingAlgorithm (#361)
Co-authored-by: Ilya Nikulshin <[email protected]>
1 parent 9b96183 commit dc409d9

File tree

9 files changed

+410
-22
lines changed

9 files changed

+410
-22
lines changed

‎Source/EasyNetQ.Management.Client.ApprovalTests/EasyNetQ.Management.Client.approved.txt

Lines changed: 53 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,14 @@ namespace EasyNetQ.Management.Client
110110
public static void CreateUser(this EasyNetQ.Management.Client.IManagementClient client, string userName, EasyNetQ.Management.Client.Model.UserInfo userInfo, System.Threading.CancellationToken cancellationToken = default) { }
111111
public static System.Threading.Tasks.Task CreateUserAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.User user, EasyNetQ.Management.Client.Model.UserInfo userInfo, System.Threading.CancellationToken cancellationToken = default) { }
112112
public static System.Threading.Tasks.Task CreateUserAsync(this EasyNetQ.Management.Client.IManagementClient client, string userName, EasyNetQ.Management.Client.Model.UserInfo userInfo, System.Threading.CancellationToken cancellationToken = default) { }
113+
public static void CreateUserMaxChannelsLimit(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.User user, int maxChannels, System.Threading.CancellationToken cancellationToken = default) { }
114+
public static void CreateUserMaxChannelsLimit(this EasyNetQ.Management.Client.IManagementClient client, string userName, int maxChannels, System.Threading.CancellationToken cancellationToken = default) { }
115+
public static System.Threading.Tasks.Task CreateUserMaxChannelsLimitAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.User user, int maxChannels, System.Threading.CancellationToken cancellationToken = default) { }
116+
public static System.Threading.Tasks.Task CreateUserMaxChannelsLimitAsync(this EasyNetQ.Management.Client.IManagementClient client, string userName, int maxChannels, System.Threading.CancellationToken cancellationToken = default) { }
117+
public static void CreateUserMaxConnectionsLimit(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.User user, int maxConnections, System.Threading.CancellationToken cancellationToken = default) { }
118+
public static void CreateUserMaxConnectionsLimit(this EasyNetQ.Management.Client.IManagementClient client, string userName, int maxConnections, System.Threading.CancellationToken cancellationToken = default) { }
119+
public static System.Threading.Tasks.Task CreateUserMaxConnectionsLimitAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.User user, int maxConnections, System.Threading.CancellationToken cancellationToken = default) { }
120+
public static System.Threading.Tasks.Task CreateUserMaxConnectionsLimitAsync(this EasyNetQ.Management.Client.IManagementClient client, string userName, int maxConnections, System.Threading.CancellationToken cancellationToken = default) { }
113121
public static void CreateVhost(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, System.Threading.CancellationToken cancellationToken = default) { }
114122
public static void CreateVhost(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
115123
public static System.Threading.Tasks.Task CreateVhostAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, System.Threading.CancellationToken cancellationToken = default) { }
@@ -181,6 +189,14 @@ namespace EasyNetQ.Management.Client
181189
public static void DeleteUser(this EasyNetQ.Management.Client.IManagementClient client, string userName, System.Threading.CancellationToken cancellationToken = default) { }
182190
public static System.Threading.Tasks.Task DeleteUserAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.User user, System.Threading.CancellationToken cancellationToken = default) { }
183191
public static System.Threading.Tasks.Task DeleteUserAsync(this EasyNetQ.Management.Client.IManagementClient client, string userName, System.Threading.CancellationToken cancellationToken = default) { }
192+
public static void DeleteUserMaxChannelsLimit(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.User user, System.Threading.CancellationToken cancellationToken = default) { }
193+
public static void DeleteUserMaxChannelsLimit(this EasyNetQ.Management.Client.IManagementClient client, string userName, System.Threading.CancellationToken cancellationToken = default) { }
194+
public static System.Threading.Tasks.Task DeleteUserMaxChannelsLimitAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.User user, System.Threading.CancellationToken cancellationToken = default) { }
195+
public static System.Threading.Tasks.Task DeleteUserMaxChannelsLimitAsync(this EasyNetQ.Management.Client.IManagementClient client, string userName, System.Threading.CancellationToken cancellationToken = default) { }
196+
public static void DeleteUserMaxConnectionsLimit(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.User user, System.Threading.CancellationToken cancellationToken = default) { }
197+
public static void DeleteUserMaxConnectionsLimit(this EasyNetQ.Management.Client.IManagementClient client, string userName, System.Threading.CancellationToken cancellationToken = default) { }
198+
public static System.Threading.Tasks.Task DeleteUserMaxConnectionsLimitAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.User user, System.Threading.CancellationToken cancellationToken = default) { }
199+
public static System.Threading.Tasks.Task DeleteUserMaxConnectionsLimitAsync(this EasyNetQ.Management.Client.IManagementClient client, string userName, System.Threading.CancellationToken cancellationToken = default) { }
184200
public static void DeleteVhost(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, System.Threading.CancellationToken cancellationToken = default) { }
185201
public static void DeleteVhost(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
186202
public static System.Threading.Tasks.Task DeleteVhostAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, System.Threading.CancellationToken cancellationToken = default) { }
@@ -344,6 +360,12 @@ namespace EasyNetQ.Management.Client
344360
public static EasyNetQ.Management.Client.Model.User GetUser(this EasyNetQ.Management.Client.IManagementClient client, string userName, System.Threading.CancellationToken cancellationToken = default) { }
345361
public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.User> GetUserAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.User user, System.Threading.CancellationToken cancellationToken = default) { }
346362
public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.User> GetUserAsync(this EasyNetQ.Management.Client.IManagementClient client, string userName, System.Threading.CancellationToken cancellationToken = default) { }
363+
public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.UserLimits> GetUserLimits(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
364+
public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.UserLimits> GetUserLimits(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.User user, System.Threading.CancellationToken cancellationToken = default) { }
365+
public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.UserLimits> GetUserLimits(this EasyNetQ.Management.Client.IManagementClient client, string userName, System.Threading.CancellationToken cancellationToken = default) { }
366+
public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.UserLimits>> GetUserLimitsAsync(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
367+
public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.UserLimits>> GetUserLimitsAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.User user, System.Threading.CancellationToken cancellationToken = default) { }
368+
public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.UserLimits>> GetUserLimitsAsync(this EasyNetQ.Management.Client.IManagementClient client, string userName, System.Threading.CancellationToken cancellationToken = default) { }
347369
public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.User> GetUsers(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
348370
public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.User>> GetUsersAsync(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
349371
public static EasyNetQ.Management.Client.Model.Vhost GetVhost(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, System.Threading.CancellationToken cancellationToken = default) { }
@@ -876,6 +898,19 @@ namespace EasyNetQ.Management.Client.Model
876898
[System.Text.Json.Serialization.JsonConverter(typeof(EasyNetQ.Management.Client.Serialization.UnixMsDateTimeConverter))]
877899
public System.DateTime Timestamp { get; init; }
878900
}
901+
public class LimitInfo : System.IEquatable<EasyNetQ.Management.Client.Model.LimitInfo>
902+
{
903+
public LimitInfo(int Value) { }
904+
public int Value { get; init; }
905+
}
906+
public class Limits : System.IEquatable<EasyNetQ.Management.Client.Model.Limits>
907+
{
908+
public Limits(long? MaxChannels, long? MaxConnections) { }
909+
[System.Text.Json.Serialization.JsonPropertyName("max-channels")]
910+
public long? MaxChannels { get; init; }
911+
[System.Text.Json.Serialization.JsonPropertyName("max-connections")]
912+
public long? MaxConnections { get; init; }
913+
}
879914
public class Listener : System.IEquatable<EasyNetQ.Management.Client.Model.Listener>
880915
{
881916
public Listener(string Node, string Protocol, string IpAddress, int Port, EasyNetQ.Management.Client.Model.SocketOpts? SocketOpts = null) { }
@@ -1515,20 +1550,35 @@ namespace EasyNetQ.Management.Client.Model
15151550
}
15161551
public class User : System.IEquatable<EasyNetQ.Management.Client.Model.User>
15171552
{
1518-
public User(string Name, string PasswordHash, System.Collections.Generic.IReadOnlyList<string> Tags) { }
1553+
public User(string Name, string PasswordHash, System.Collections.Generic.IReadOnlyList<string> Tags, System.Security.Cryptography.HashAlgorithmName? HashingAlgorithm = default, EasyNetQ.Management.Client.Model.Limits? Limits = null) { }
1554+
[System.Text.Json.Serialization.JsonConverter(typeof(EasyNetQ.Management.Client.Serialization.HashAlgorithmNameConverter))]
1555+
public System.Security.Cryptography.HashAlgorithmName? HashingAlgorithm { get; init; }
1556+
public EasyNetQ.Management.Client.Model.Limits? Limits { get; init; }
15191557
public string Name { get; init; }
15201558
public string PasswordHash { get; init; }
15211559
public System.Collections.Generic.IReadOnlyList<string> Tags { get; init; }
15221560
}
15231561
public class UserInfo : System.IEquatable<EasyNetQ.Management.Client.Model.UserInfo>
15241562
{
1525-
public UserInfo(string? Password, string? PasswordHash, System.Collections.Generic.IReadOnlyList<string> Tags) { }
1563+
public UserInfo(string? Password, string? PasswordHash, System.Collections.Generic.IReadOnlyList<string> Tags, System.Security.Cryptography.HashAlgorithmName? HashingAlgorithm = default) { }
1564+
[System.Text.Json.Serialization.JsonConverter(typeof(EasyNetQ.Management.Client.Serialization.HashAlgorithmNameConverter))]
1565+
public System.Security.Cryptography.HashAlgorithmName? HashingAlgorithm { get; init; }
15261566
public string? PasswordHash { get; init; }
15271567
public string? Password { get; init; }
15281568
public System.Collections.Generic.IReadOnlyList<string> Tags { get; init; }
15291569
public EasyNetQ.Management.Client.Model.UserInfo AddTag(string tag) { }
1570+
public EasyNetQ.Management.Client.Model.UserInfo WithTags(params string[] tags) { }
15301571
public static EasyNetQ.Management.Client.Model.UserInfo ByPassword(string password) { }
1531-
public static EasyNetQ.Management.Client.Model.UserInfo ByPasswordHash(string passwordHash) { }
1572+
public static EasyNetQ.Management.Client.Model.UserInfo ByPasswordAndHashAlgorithm(string password, System.Security.Cryptography.HashAlgorithmName? hashAlgorithmName) { }
1573+
public static EasyNetQ.Management.Client.Model.UserInfo ByPasswordHash(string passwordHash, System.Security.Cryptography.HashAlgorithmName? hashAlgorithmName = default) { }
1574+
public static string ComputePasswordHash(string password, System.Security.Cryptography.HashAlgorithmName? hashAlgorithmName = default) { }
1575+
}
1576+
public class UserLimits : System.IEquatable<EasyNetQ.Management.Client.Model.UserLimits>
1577+
{
1578+
public UserLimits(string User, EasyNetQ.Management.Client.Model.Limits Limits) { }
1579+
[System.Text.Json.Serialization.JsonPropertyName("value")]
1580+
public EasyNetQ.Management.Client.Model.Limits Limits { get; init; }
1581+
public string User { get; init; }
15321582
}
15331583
public static class UserTags
15341584
{

0 commit comments

Comments
 (0)