From 4a1e1471f6ff6ed4d5f9c57afb77e0ea4aaccf18 Mon Sep 17 00:00:00 2001
From: "Jakob A. Dam" <jakob.a.dam@gmail.com>
Date: Wed, 8 Apr 2015 09:59:37 +0200
Subject: [PATCH] Notify if shared RADIUS secret is missing

---
 CICRadarR/CICRadarR.vbproj                   | 3 ++-
 CICRadarR/RADIUSServer.vb                    | 5 +++++
 CICRadarR/exceptions/MissingRadiusSecret.vb  | 9 +++++++++
 CICRadarR/exceptions/MissingUser.vb          | 3 +++
 CICRadarR/exceptions/MissingUserException.vb | 3 ---
 CICRadarR/handlers/RDSHandler.vb             | 5 +++--
 6 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 CICRadarR/exceptions/MissingRadiusSecret.vb
 create mode 100644 CICRadarR/exceptions/MissingUser.vb
 delete mode 100644 CICRadarR/exceptions/MissingUserException.vb

diff --git a/CICRadarR/CICRadarR.vbproj b/CICRadarR/CICRadarR.vbproj
index f18c53a..01aaee7 100644
--- a/CICRadarR/CICRadarR.vbproj
+++ b/CICRadarR/CICRadarR.vbproj
@@ -78,7 +78,8 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Conversion.vb" />
-    <Compile Include="exceptions\MissingUserException.vb" />
+    <Compile Include="exceptions\MissingRadiusSecret.vb" />
+    <Compile Include="exceptions\MissingUser.vb" />
     <Compile Include="handlers\RDSHandler.vb" />
     <Compile Include="VendorSpefic.vb" />
     <Compile Include="Crypto.vb" />
diff --git a/CICRadarR/RADIUSServer.vb b/CICRadarR/RADIUSServer.vb
index 690dfce..63ee8d5 100644
--- a/CICRadarR/RADIUSServer.vb
+++ b/CICRadarR/RADIUSServer.vb
@@ -67,6 +67,11 @@ Public Class RADIUSServer
             Dim hasher As System.Security.Cryptography.MD5 = System.Security.Cryptography.MD5.Create
             Dim hash() As Byte = {}
             Dim secret As String = mSecrets.GetSharedSecret(packet.EndPoint.Address.ToString)
+
+            If secret = Nothing Then
+                Throw New MissingRadiusSecret(packet.EndPoint.Address.ToString)
+            End If
+
             Array.Resize(hash, data.Length + secret.Length)
             data.CopyTo(hash, 0)
             ConvertToBytes(secret).CopyTo(hash, data.Length)
diff --git a/CICRadarR/exceptions/MissingRadiusSecret.vb b/CICRadarR/exceptions/MissingRadiusSecret.vb
new file mode 100644
index 0000000..c6c2321
--- /dev/null
+++ b/CICRadarR/exceptions/MissingRadiusSecret.vb
@@ -0,0 +1,9 @@
+Public Class MissingRadiusSecret
+
+    Inherits Exception
+
+    Public Sub New(ByVal ip As String)
+        MyBase.New("No shared secret for ip: " & ip & ". This MUST be inserted in the config file.")
+    End Sub
+
+End Class
diff --git a/CICRadarR/exceptions/MissingUser.vb b/CICRadarR/exceptions/MissingUser.vb
new file mode 100644
index 0000000..d31b77d
--- /dev/null
+++ b/CICRadarR/exceptions/MissingUser.vb
@@ -0,0 +1,3 @@
+Public Class MissingUser
+    Inherits Exception
+End Class
diff --git a/CICRadarR/exceptions/MissingUserException.vb b/CICRadarR/exceptions/MissingUserException.vb
deleted file mode 100644
index 6710dcb..0000000
--- a/CICRadarR/exceptions/MissingUserException.vb
+++ /dev/null
@@ -1,3 +0,0 @@
-Public Class MissingUserException
-    Inherits Exception
-End Class
diff --git a/CICRadarR/handlers/RDSHandler.vb b/CICRadarR/handlers/RDSHandler.vb
index 8e407dc..631f774 100644
--- a/CICRadarR/handlers/RDSHandler.vb
+++ b/CICRadarR/handlers/RDSHandler.vb
@@ -122,6 +122,7 @@ Public Class RDSHandler
                 Accept()
             End If
         Catch ex As Exception
+            Console.WriteLine("Authentication failed. Sending reject.")
             mPacket.RejectAccessRequest()
         End Try
     End Sub
@@ -179,6 +180,7 @@ Public Class RDSHandler
         Dim password As String = mPacket.UserPassword
         Dim ldapDomain As String = CICRadarR.LDAPDomain
 
+        Console.WriteLine("Authenticating: LDAPPAth: " & "LDAP://" & ldapDomain & ", Username: " & packetUsername)
         Dim dirEntry As New DirectoryEntry("LDAP://" & ldapDomain, packetUsername, password)
 
         Dim obj As Object = dirEntry.NativeObject
@@ -196,12 +198,11 @@ Public Class RDSHandler
             search.PropertiesToLoad.Add(CICRadarR.ADMailField)
         End If
 
-        Console.WriteLine("Authenticating: LDAPPAth: " & "LDAP://" & ldapDomain & ", Username: " & packetUsername)
         Dim result = search.FindOne()
 
         If IsDBNull(result) Then
             Console.WriteLine("Failed to authenticate with Active Directory")
-            Throw New MissingUserException
+            Throw New MissingUser
         End If
 
         Return result