Merge pull request #5 from RockSolidKnowledge/rah/add_missing_events

Add IdentityServer events to AdapterFactory

Author: RaheelRsk

azure-pipelines.yml

@@ -11,7 +11,7 @@ variables:
 - name: efPackageVersion
   value: '2.0.0.0'
 - name: identityPackageVersion
-  value: '2.0.0.0'
+  value: '3.0.0.0'
 - name: RunSqlServerTest
   value: 'true'
 stages:

src/RSK.IdentityServer4.AuditEventSink/Adapters/GrantsRevokedEventAdapter.cs

@@ -12,6 +12,7 @@ public GrantsRevokedEventAdapter(GrantsRevokedEvent evt)
         {
             this.evt = evt ?? throw new ArgumentNullException(nameof(evt));
         }
+
         public ResourceActor Actor => new ResourceActor(ResourceActor.UserSubjectType, evt.SubjectId, evt.SubjectId);
         public string Action => evt.Name;
         public AuditableResource Resource => new AuditableResource("Client", evt.ClientId);

src/RSK.IdentityServer4.AuditEventSink/Adapters/UserLoginSuccessEventAdapter.cs

@@ -14,11 +14,8 @@ public UserLoginSuccessEventAdapter(UserLoginSuccessEvent evt)
         }
 
         public ResourceActor Actor => new ResourceActor(ResourceActor.UserSubjectType, evt.SubjectId, evt.DisplayName);
-
         public string Action => evt.Name;
-
         public AuditableResource Resource => new AuditableResource("IdentityServer", evt.Endpoint);
-
         public FormattedString Description => evt.ToString().SafeForFormatted();
     }
 }

src/Rsk.Audit.EF/Rsk.Audit.EF.csproj

@@ -7,7 +7,7 @@
     <Description>Provides audting API to record audit records and query api to find audit records with EntityFramework Core</Description>
     <PackageProjectUrl>https://www.identityserver.com/products/adminui</PackageProjectUrl>
     <PackageReleaseNotes>https://www.identityserver.com/downloads/adminui</PackageReleaseNotes>
-    <Copyright>Copyright 2021 (c) Rock Solid Knowledge Ltd. All rights reserved.</Copyright>
+    <Copyright>Copyright 2022 (c) Rock Solid Knowledge Ltd. All rights reserved.</Copyright>
     <PackageTags>Audit AdminUI IdentityServer EntityFramework</PackageTags>
     <IncludeSymbols>true</IncludeSymbols>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

src/Rsk.Audit/Rsk.Audit.csproj

@@ -8,7 +8,7 @@
     <Description>Provides audting API to record audit records and query api to find audit records</Description>
     <PackageProjectUrl>https://www.identityserver.com/products/adminui</PackageProjectUrl>
     <PackageReleaseNotes>https://www.identityserver.com/downloads/adminui</PackageReleaseNotes>
-    <Copyright>Copyright 2021 (c) Rock Solid Knowledge Ltd. All rights reserved.</Copyright>
+    <Copyright>Copyright 2022 (c) Rock Solid Knowledge Ltd. All rights reserved.</Copyright>
     <PackageTags>Audit AdminUI IdentityServer</PackageTags>
     <IncludeSymbols>true</IncludeSymbols>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

src/Rsk.DuendeIdentityServer.AuditEventSink/AdapterFactory.cs

@@ -12,22 +12,50 @@ public IAuditEventArguments Create(Event evt)
             {
                 switch (evt)
                 {
-                    case TokenIssuedSuccessEvent tokenIssuedSuccessEvent:
-                        return new TokenIssuedSuccessEventAdapter(tokenIssuedSuccessEvent);
-                    case UserLoginSuccessEvent userLoginSuccess:
-                        return new UserLoginSuccessEventAdapter(userLoginSuccess);
-                    case UserLoginFailureEvent userLoginFailure:
-                        return new UserLoginFailureEventAdapter(userLoginFailure);
-                    case UserLogoutSuccessEvent userLogoutSuccess:
-                        return new UserLogoutSuccessEventAdapter(userLogoutSuccess);
-                    case ConsentGrantedEvent consentGranted:
-                        return new ConsentGrantedEventAdapter(consentGranted);
-                    case ConsentDeniedEvent consentDenied:
-                        return new ConsentDeniedEventAdapter(consentDenied);
-                    case TokenIssuedFailureEvent tokenIssuedFailure:
-                        return new TokenIssuedFailureEventAdapter(tokenIssuedFailure);
-                    case GrantsRevokedEvent grantsRevoked:
-                        return new GrantsRevokedEventAdapter(grantsRevoked);
+                    case TokenIssuedSuccessEvent e:
+                        return new TokenIssuedSuccessEventAdapter(e);
+                    case UserLoginSuccessEvent e:
+                        return new UserLoginSuccessEventAdapter(e);
+                    case UserLoginFailureEvent e:
+                        return new UserLoginFailureEventAdapter(e);
+                    case UserLogoutSuccessEvent e:
+                        return new UserLogoutSuccessEventAdapter(e);
+                    case ConsentGrantedEvent e:
+                        return new ConsentGrantedEventAdapter(e);
+                    case ConsentDeniedEvent e:
+                        return new ConsentDeniedEventAdapter(e);
+                    case TokenIssuedFailureEvent e:
+                        return new TokenIssuedFailureEventAdapter(e);
+                    case GrantsRevokedEvent e:
+                        return new GrantsRevokedEventAdapter(e);
+                    case DeviceAuthorizationFailureEvent e:
+                        return new DeviceAuthorizationFailureEventAdapter(e);
+                    case DeviceAuthorizationSuccessEvent e:
+                        return new DeviceAuthorizationSuccessEventAdapter(e);
+                    case TokenRevokedSuccessEvent e:
+                        return new TokenRevokedSuccessEventAdapter(e);
+                    case InvalidClientConfigurationEvent e:
+                        return new InvalidClientConfigurationEventAdapter(e);
+                    case TokenIntrospectionFailureEvent e:
+                        return new TokenIntrospectionFailureEventAdapter(e);
+                    case TokenIntrospectionSuccessEvent e:
+                        return new TokenIntrospectionSuccessEventAdapter(e);
+                    case ClientAuthenticationFailureEvent e:
+                        return new ClientAuthenticationFailureEventAdapter(e);
+                    case ClientAuthenticationSuccessEvent e:
+                        return new ClientAuthenticationSuccessEventAdapter(e);
+                    case ApiAuthenticationFailureEvent e:
+                        return new ApiAuthenticationFailureEventAdapter(e);
+                    case ApiAuthenticationSuccessEvent e:
+                        return new ApiAuthenticationSuccessEventAdapter(e);
+                    case UnhandledExceptionEvent e:
+                        return new UnhandledExceptionEventAdapter(e);
+                    case BackchannelAuthenticationSuccessEvent e:
+                        return new BackchannelAuthenticationSuccessEventAdapter(e);
+                    case BackchannelAuthenticationFailureEvent e:
+                              return new BackchannelAuthenticationFailureEventAdapter(e);
+                    case InvalidIdentityProviderConfiguration e:
+                        return new InvalidIdentityProviderConfigurationAdapter(e);
                 }
             }
 

src/Rsk.DuendeIdentityServer.AuditEventSink/Adapters/ApiAuthenticationFailureEventAdapter.cs

@@ -0,0 +1,21 @@
+using System;
+using Duende.IdentityServer.Events;
+using RSK.Audit;
+
+namespace Rsk.DuendeIdentityServer.AuditEventSink.Adapters
+{
+    public class ApiAuthenticationFailureEventAdapter : IAuditEventArguments
+    {
+        private readonly ApiAuthenticationFailureEvent evt;
+
+        public ApiAuthenticationFailureEventAdapter(ApiAuthenticationFailureEvent evt)
+        {
+            this.evt = evt ?? throw new ArgumentNullException(nameof(evt));
+        }
+
+        public ResourceActor Actor => new ResourceActor(ResourceActor.MachineSubjectType, null, null);
+        public string Action => evt.Name;
+        public AuditableResource Resource => new AuditableResource("IdentityServer", evt.ApiName);
+        public FormattedString Description => evt.ToString().SafeForFormatted();
+    }
+}

src/Rsk.DuendeIdentityServer.AuditEventSink/Adapters/ApiAuthenticationSuccessEventAdapter.cs

@@ -0,0 +1,21 @@
+using System;
+using Duende.IdentityServer.Events;
+using RSK.Audit;
+
+namespace Rsk.DuendeIdentityServer.AuditEventSink.Adapters
+{
+    public class ApiAuthenticationSuccessEventAdapter : IAuditEventArguments
+    {
+        private readonly ApiAuthenticationSuccessEvent evt;
+
+        public ApiAuthenticationSuccessEventAdapter(ApiAuthenticationSuccessEvent evt)
+        {
+            this.evt = evt ?? throw new ArgumentNullException(nameof(evt));
+        }
+
+        public ResourceActor Actor => new ResourceActor(ResourceActor.MachineSubjectType, null, null);
+        public string Action => evt.Name;
+        public AuditableResource Resource => new AuditableResource("IdentityServer", evt.ApiName);
+        public FormattedString Description => evt.ToString().SafeForFormatted();
+    }
+}

src/Rsk.DuendeIdentityServer.AuditEventSink/Adapters/BackchannelAuthenticationFailureEventAdapter.cs

@@ -0,0 +1,21 @@
+using System;
+using Duende.IdentityServer.Events;
+using RSK.Audit;
+
+namespace Rsk.DuendeIdentityServer.AuditEventSink.Adapters
+{
+    public class BackchannelAuthenticationFailureEventAdapter : IAuditEventArguments
+    {
+        private readonly BackchannelAuthenticationFailureEvent evt;
+
+        public BackchannelAuthenticationFailureEventAdapter(BackchannelAuthenticationFailureEvent evt)
+        {
+            this.evt = evt ?? throw new ArgumentNullException(nameof(evt));
+        }
+
+        public ResourceActor Actor => new ResourceActor(ResourceActor.MachineSubjectType, evt.ClientId, evt.ClientName);
+        public string Action => evt.Name;
+        public AuditableResource Resource => new AuditableResource("IdentityServer", evt.Endpoint);
+        public FormattedString Description => evt.ToString().SafeForFormatted();
+    }
+}

src/Rsk.DuendeIdentityServer.AuditEventSink/Adapters/BackchannelAuthenticationSuccessEventAdapter.cs

@@ -0,0 +1,21 @@
+using System;
+using Duende.IdentityServer.Events;
+using RSK.Audit;
+
+namespace Rsk.DuendeIdentityServer.AuditEventSink.Adapters
+{
+    public class BackchannelAuthenticationSuccessEventAdapter : IAuditEventArguments
+    {
+        private readonly BackchannelAuthenticationSuccessEvent evt;
+
+        public BackchannelAuthenticationSuccessEventAdapter(BackchannelAuthenticationSuccessEvent evt)
+        {
+            this.evt = evt ?? throw new ArgumentNullException(nameof(evt));
+        }
+
+        public ResourceActor Actor => new ResourceActor(ResourceActor.MachineSubjectType, evt.ClientId, evt.ClientName);
+        public string Action => evt.Name;
+        public AuditableResource Resource => new AuditableResource("IdentityServer", evt.Endpoint);
+        public FormattedString Description => evt.ToString().SafeForFormatted();
+    }
+}