GithubStar/UA-.NETStandard
1
0
Fork 0
mirror of https://github.com/OPCFoundation/UA-.NETStandard.git synced 2026-10-23 10:23:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #860 from AlinMoldovean/master

Browse Source 
Nonce validation fix in Client Session
This commit is contained in:
Alin Moldovean
2019-12-02 16:08:34 +02:00
committed by GitHub
parent de9872320c 77a183ec6b
commit f1a16df2e2
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SampleApplications/SDK/Opc.Ua.Client/Session.cs
+1 -1
View File
@@ -316,7 +316,7 @@ namespace Opc.Ua.Client
if (identity!= null && identity.TokenType != UserTokenType.Anonymous)
{
// the server nonce should be validated if the token includes a secret.
if (!Utils.Nonce.ValidateNonce(serverNonce, MessageSecurityMode.SignAndEncrypt, securityPolicyUri))
if (!Utils.Nonce.ValidateNonce(serverNonce, MessageSecurityMode.SignAndEncrypt, (uint)m_configuration.SecurityConfiguration.NonceLength))
{
throw ServiceResultException.Create(StatusCodes.BadNonceInvalid, "Server nonce is not the correct length or not random enough.");
}
Stack/Opc.Ua.Core/Types/Utils/Utils.cs
+9 -1
View File
@@ -2664,6 +2664,14 @@ namespace Opc.Ua
/// Validates the nonce for a message security mode and security policy.
/// </summary>
public static bool ValidateNonce(byte[] nonce, MessageSecurityMode securityMode, string securityPolicyUri)
{
return ValidateNonce(nonce, securityMode, GetNonceLength(securityPolicyUri));
}
/// <summary>
/// Validates the nonce for a message security mode and a minimum length.
/// </summary>
public static bool ValidateNonce(byte[] nonce, MessageSecurityMode securityMode, uint minNonceLength)
{
// no nonce needed for no security.
if (securityMode == MessageSecurityMode.None)
@@ -2672,7 +2680,7 @@ namespace Opc.Ua
}
// check the length.
if (nonce == null || nonce.Length < GetNonceLength(securityPolicyUri))
if (nonce == null || nonce.Length < minNonceLength)
{
return false;
}