Is_Secure: New routine in Socket API

Author: anisimkov

regtests/0155_user_sock/usock.ads

@@ -85,6 +85,8 @@ package USock is
 
    overriding function Is_Listening (Socket : U_Socket) return Boolean;
 
+   overriding function Is_Secure (Socket : U_Socket) return Boolean;
+
    overriding procedure Set_Send_Buffer_Size
      (Socket : U_Socket;
       Size   : Natural);
@@ -115,4 +117,7 @@ private
       Server : Boolean := False;
    end record;
 
+   overriding function Is_Secure (Socket : U_Socket) return Boolean
+   is (False);
+
 end USock;

src/core/aws-client.adb

@@ -493,7 +493,7 @@ package body AWS.Client is
          Connect (Connection.Self.all);
       end if;
 
-      if Connection.Socket.all in AWS.Net.SSL.Socket_Type'Class then
+      if Connection.Socket.Is_Secure then
          return Net.SSL.Certificate.Get
            (Net.SSL.Socket_Type (Connection.Socket.all));
       else

src/core/aws-net-memory.ads

@@ -150,6 +150,8 @@ package AWS.Net.Memory is
    overriding function Errno (Socket : Socket_Type) return Integer;
    --  Returns and clears error state in socket
 
+   overriding function Is_Secure (Socket : Socket_Type) return Boolean;
+
 private
 
    type Element_Access is access Stream_Element_Array;
@@ -171,4 +173,7 @@ private
 
    overriding procedure Initialize (Socket : in out Socket_Type);
 
+   overriding function Is_Secure (Socket : Socket_Type) return Boolean
+   is (False);
+
 end AWS.Net.Memory;

src/core/aws-net-ssl.ads

@@ -336,6 +336,8 @@ package AWS.Net.SSL is
       Key  : Private_Key;
       Hash : Hash_Method) return Stream_Element_Array with Inline;
 
+   overriding function Is_Secure (Socket : Socket_Type) return Boolean;
+
 private
 
    package TSSL renames Standard.SSL.Thin;
@@ -425,4 +427,7 @@ private
       Hash : Hash_Method) return Stream_Element_Array
    is (Signature (Data'Address, Data'Length, Key, Hash));
 
+   overriding function Is_Secure (Socket : Socket_Type) return Boolean
+   is (True);
+
 end AWS.Net.SSL;

src/core/aws-net-std.ads

@@ -176,6 +176,8 @@ package AWS.Net.Std is
    overriding function Errno (Socket : Socket_Type) return Integer;
    --  Returns and clears error state in socket
 
+   overriding function Is_Secure (Socket : Socket_Type) return Boolean;
+
 private
 
    type Socket_Hidden;
@@ -200,4 +202,7 @@ private
    --  readable manner. Declare in specification because it is common code for
    --  GNAT and IPv6 implementations.
 
+   overriding function Is_Secure (Socket : Socket_Type) return Boolean
+   is (False);
+
 end AWS.Net.Std;

src/core/aws-net-websocket.ads

@@ -257,6 +257,8 @@ package AWS.Net.WebSocket is
    --  Returns a unique id for the given socket. The uniqueness for this socket
    --  is guaranteed during the lifetime of the application.
 
+   overriding function Is_Secure (Socket : Object) return Boolean;
+
 private
 
    type Internal_State is record
@@ -412,4 +414,7 @@ private
    --  stage, Socket.On_Message will be called.
    --  In case of error, other callbacks will be used as appropriate.
 
+   overriding function Is_Secure (Socket : Object) return Boolean
+   is (Socket.Socket.Is_Secure);
+
 end AWS.Net.WebSocket;

src/core/aws-net.ads

@@ -228,6 +228,9 @@ package AWS.Net is
    --  Returns true if the socket has been marked to accept connections with
    --  listen.
 
+   function Is_Secure (Socket : Socket_Type) return Boolean is abstract;
+   --  Returns True if socket is secure
+
    function IPv6_Available return Boolean;
    --  Returns True if IPv6 available in OS and in AWS socket implementation
 

src/core/aws-server.adb

@@ -30,7 +30,6 @@
 pragma Ada_2012;
 
 with Ada.Streams;
-with Ada.Tags;
 with Ada.Text_IO;
 with Ada.Unchecked_Deallocation;
 
@@ -77,8 +76,6 @@ package body AWS.Server is
      (Server : not null access HTTP)
       return not null access Net.Socket_Type'Class
    is
-      use type Ada.Tags.Tag;
-
       New_Socket : Net.Socket_Access;
 
       procedure Accept_Error (E : Ada.Exceptions.Exception_Occurrence);
@@ -101,7 +98,7 @@ package body AWS.Server is
       Net.Acceptors.Get (Server.Acceptor, New_Socket, Accept_Error'Access);
 
       if CNF.Security (Server.Properties)
-        and then New_Socket'Tag /= Net.SSL.Socket_Type'Tag
+        and then not New_Socket.Is_Secure
       then
          declare
             SSL_Socket : Net.Socket_Access;