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

Merge pull request #915 from AlinMoldovean/master

Browse Source 
CTT compliance fixes for Audit events.
This commit is contained in:
Alin Moldovean
2020-03-10 17:26:11 +02:00
committed by GitHub
parent 0d01fbba64 ab5d93fa60
commit f617c2aaae
1 changed files with 48 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SampleApplications/SDK/Opc.Ua.Server/Session/Session.cs
+48 -32
View File
@@ -205,8 +205,7 @@ namespace Opc.Ua.Server
true,
DateTime.UtcNow);
e.SetChildValue(systemContext, BrowseNames.SourceNode, m_sessionId, false);
e.SetChildValue(systemContext, BrowseNames.SourceName, m_sessionName, false);
e.SetChildValue(systemContext, BrowseNames.SourceNode, ObjectIds.Server, false);
e.SetChildValue(systemContext, BrowseNames.SessionId, m_sessionId, false);
e.SetChildValue(systemContext, BrowseNames.ServerId, m_server.ServerUris.GetString(0), false);
e.SetChildValue(systemContext, BrowseNames.ClientUserId, m_identity.DisplayName, false);
@@ -218,21 +217,29 @@ namespace Opc.Ua.Server
/// </summary>
private void ReportAuditCreateSessionEvent(ServerSystemContext context)
{
// raise an audit event.
AuditCreateSessionEventState e = new AuditCreateSessionEventState(null);
TranslationInfo message = new TranslationInfo(
"AuditCreateSessionEvent",
"en-US",
"Session {0} created.",
m_sessionName);
try
{
// raise an audit event.
AuditCreateSessionEventState e = new AuditCreateSessionEventState(null);
InitializeSessionAuditEvent(context, e, message);
e.SetChildValue(context, BrowseNames.ClientCertificate, m_securityDiagnostics.ClientCertificate, false);
e.SetChildValue(context, BrowseNames.SecureChannelId, m_secureChannelId, false);
TranslationInfo message = new TranslationInfo(
"AuditCreateSessionEvent",
"en-US",
"Session {0} created.",
m_sessionName);
m_server.ReportEvent(context, e);
InitializeSessionAuditEvent(context, e, message);
e.SetChildValue(context, BrowseNames.SourceName, "Session/CreateSession", false);
e.SetChildValue(context, BrowseNames.ClientCertificate, m_securityDiagnostics.ClientCertificate, false);
e.SetChildValue(context, BrowseNames.SecureChannelId, m_secureChannelId, false);
m_server.ReportEvent(context, e);
}
catch (Exception e)
{
Utils.Trace(e, "Error while reporting AuditCreateSessionEvent event for SessionId {0}.", m_sessionId);
}
}
/// <summary>
@@ -240,27 +247,36 @@ namespace Opc.Ua.Server
/// </summary>
private void ReportAuditActivateSessionEvent(ServerSystemContext context)
{
AuditActivateSessionEventState e = new AuditActivateSessionEventState(null);
TranslationInfo message = new TranslationInfo(
"AuditActivateSessionEvent",
"en-US",
"Session {0} activated.",
m_sessionName);
InitializeSessionAuditEvent(context, e, message);
if (m_softwareCertificates != null)
try
{
e.SetChildValue(context, BrowseNames.ClientSoftwareCertificates, m_softwareCertificates.ToArray(), false);
}
AuditActivateSessionEventState e = new AuditActivateSessionEventState(null);
if (m_identityToken != null)
TranslationInfo message = new TranslationInfo(
"AuditActivateSessionEvent",
"en-US",
"Session {0} activated.",
m_sessionName);
InitializeSessionAuditEvent(context, e, message);
e.SetChildValue(context, BrowseNames.SourceName, "Session/ActivateSession", false);
if (m_softwareCertificates != null && m_softwareCertificates.Count > 0)
{
e.SetChildValue(context, BrowseNames.ClientSoftwareCertificates, m_softwareCertificates.ToArray(), false);
}
if (m_identityToken != null)
{
e.SetChildValue(context, BrowseNames.UserIdentityToken, Utils.Clone(m_identityToken), false);
}
m_server.ReportEvent(context, e);
}
catch (Exception e)
{
e.SetChildValue(context, BrowseNames.UserIdentityToken, Utils.Clone(m_identityToken), false);
Utils.Trace(e, "Error while reporting AuditActivateSessionEvent event for SessionId {0}.", m_sessionId);
}
m_server.ReportEvent(context, e);
}
#region IDisposable Members