ruby_smb 3.1.7 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2709740a324a2a43861b70704a20c07ad3302390e40ad2cb2b19aa4574e1718c
-  data.tar.gz: 9a4e4d4e59ae52a67b02f098c4610137182e5ff2cb4106a5d710c5b9e5d0de44
+  metadata.gz: 9ce8d4ea99335efaf6bbc1ef003231ffa8a809382760e54dc26be04b76e53529
+  data.tar.gz: f284dabf7fe032ae02933a517abb2371f7c7c37eb641876f1cbf2b8cc0e4c2ac
 SHA512:
-  metadata.gz: 00004e2a2b38ebdf190ec39bdf6abc27607ac227d705b4e5f7943737a3119ad13102ddf3884bfb697b3f7bca9ec29b45db2a0554811fd41f8e67a9bd96463244
-  data.tar.gz: 677c779a105a0a8c478923e784500c0b9ec1710d9d332a87e4967a372987c3abb86a054254b0ec4ed2e7b4ad11527fa4c3fcc9fb233df92108f8700d3bb21d93
+  metadata.gz: 5cf115ffd4c634f593bceef2bb503d2c0a2b19c5cfa73391887d35ce2691472fabda03e47462b716f8c870d7dedbc5dc815f644887b259d1268658752396ea17
+  data.tar.gz: 46ba6053ca246692ef29c545c8a9682b6675c4bf50d10d3611107bf537470226986aeece854516d59d99afa1642ee2d72fed99f39c1731112292fcbb6d8138d2

data/README.md

@@ -186,7 +186,7 @@ Example:
 ```
 ### Using the Client
 
-Sitting on top of the packet layer in RubySMB is the RubySMB::Client class. This is the abstraction that most users of RubySMB will interact with. It provides simple conveience methods for performing SMB actions. It handles the creation, sending and receiving of packets for the user, providing reasonable defaults in many cases.
+Sitting on top of the packet layer in RubySMB is the RubySMB::Client class. This is the abstraction that most users of RubySMB will interact with. It provides simple convenience methods for performing SMB actions. It handles the creation, sending and receiving of packets for the user, providing reasonable defaults in many cases.
 
 #### Negotiation
 

data/lib/ruby_smb/client/authentication.rb

@@ -1,7 +1,11 @@
+require 'ruby_smb/peer_info'
+
 module RubySMB
   class Client
     # This module holds all the backend client methods for authentication.
     module Authentication
+      include RubySMB::PeerInfo
+
       # Responsible for handling Authentication and Session Setup for
       # the SMB Client. It returns the final Status code from the authentication
       # exchange.
@@ -356,36 +360,6 @@ module RubySMB
         packet.security_mode.signing_enabled = 1
         packet
       end
-
-      # Extract and store useful information about the peer/server from the
-      # NTLM Type 2 (challenge) TargetInfo fields.
-      #
-      # @param target_info_str [String] the Target Info string
-      def store_target_info(target_info_str)
-        target_info = Net::NTLM::TargetInfo.new(target_info_str)
-        {
-          Net::NTLM::TargetInfo::MSV_AV_NB_COMPUTER_NAME  => :@default_name,
-          Net::NTLM::TargetInfo::MSV_AV_NB_DOMAIN_NAME    => :@default_domain,
-          Net::NTLM::TargetInfo::MSV_AV_DNS_COMPUTER_NAME => :@dns_host_name,
-          Net::NTLM::TargetInfo::MSV_AV_DNS_DOMAIN_NAME   => :@dns_domain_name,
-          Net::NTLM::TargetInfo::MSV_AV_DNS_TREE_NAME     => :@dns_tree_name
-        }.each do |constant, attribute|
-          if target_info.av_pairs[constant]
-            value = target_info.av_pairs[constant].dup
-            value.force_encoding('UTF-16LE')
-            instance_variable_set(attribute, value.encode('UTF-8'))
-          end
-        end
-      end
-
-      # Extract the peer/server version number from the NTLM Type 2 (challenge)
-      # Version field.
-      #
-      # @param version [String] the version number as a binary string
-      # @return [String] the formated version number (<major>.<minor>.<build>)
-      def extract_os_version(version)
-        version.unpack('CCS').join('.')
-      end
     end
   end
 end

data/lib/ruby_smb/dcerpc/client.rb

@@ -8,8 +8,11 @@ module RubySMB
       require 'net/ntlm'
       require 'ruby_smb/dcerpc'
       require 'ruby_smb/gss'
+      require 'ruby_smb/peer_info'
 
+      include Dcerpc
       include Epm
+      include PeerInfo
 
       # The default maximum size of a RPC message that the Client accepts (in bytes)
       MAX_BUFFER_SIZE = 64512
@@ -134,11 +137,11 @@ module RubySMB
       end
 
       # Connect to the RPC endpoint. If a TCP socket was not provided, it takes
-      # care of asking the Enpoint Mapper Interface the port used by the given
+      # care of asking the Endpoint Mapper Interface the port used by the given
       # endpoint provided in #initialize and connect a TCP socket
       #
       # @param port [Integer] An optional port number to connect to. If
-      #   provided, it will not ask the Enpoint Mapper Interface for a port
+      #   provided, it will not ask the Endpoint Mapper Interface for a port
       #   number.
       # @return [TcpSocket] The connected TCP socket
       def connect(port: nil)
@@ -172,218 +175,14 @@ module RubySMB
         @tcp_socket.close if @tcp_socket && !@tcp_socket.closed?
       end
 
-      # Add the authentication verifier to the packet. This includes a sec
-      # trailer and the actual authentication data.
-      #
-      # @param req [BinData::Record] the request to be updated
-      # @param auth [String] the authentication data
-      # @param auth_type [Integer] the authentication type
-      # @param auth_level [Integer] the authentication level
-      def add_auth_verifier(req, auth, auth_type, auth_level)
-        req.sec_trailer = {
-          auth_type: auth_type,
-          auth_level: auth_level,
-          auth_context_id: @ctx_id + @auth_ctx_id_base
-        }
-        req.auth_value = auth
-        req.pdu_header.auth_length = auth.length
-
-        nil
-      end
-
       def process_ntlm_type2(type2_message)
-        ntlmssp_offset = type2_message.index('NTLMSSP')
-        type2_blob = type2_message.slice(ntlmssp_offset..-1)
-        type2_b64_message = [type2_blob].pack('m')
-        type3_message = @ntlm_client.init_context(type2_b64_message)
-        auth3 = type3_message.serialize
-
-        @session_key = @ntlm_client.session_key
+        auth3 = super
         challenge_message = @ntlm_client.session.challenge_message
         store_target_info(challenge_message.target_info) if challenge_message.has_flag?(:TARGET_INFO)
         @os_version = extract_os_version(challenge_message.os_version.to_s) unless challenge_message.os_version.empty?
         auth3
       end
 
-      # Send a rpc_auth3 PDU that ends the authentication handshake.
-      #
-      # @param response [BindAck] the BindAck response packet
-      # @param auth_type [Integer] the authentication type
-      # @param auth_level [Integer] the authentication level
-      # @raise [ArgumentError] if `:auth_type` is unknown
-      # @raise [NotImplementedError] if `:auth_type` is not implemented (yet)
-      def send_auth3(response, auth_type, auth_level)
-        case auth_type
-        when RPC_C_AUTHN_NONE
-        when RPC_C_AUTHN_WINNT, RPC_C_AUTHN_DEFAULT
-          auth3 = process_ntlm_type2(response.auth_value)
-        when RPC_C_AUTHN_NETLOGON, RPC_C_AUTHN_GSS_NEGOTIATE, RPC_C_AUTHN_GSS_SCHANNEL, RPC_C_AUTHN_GSS_KERBEROS
-          # TODO
-          raise NotImplementedError
-        else
-          raise ArgumentError, "Unsupported Auth Type: #{auth_type}"
-        end
-
-        rpc_auth3 = RpcAuth3.new
-        add_auth_verifier(rpc_auth3, auth3, auth_type, auth_level)
-        rpc_auth3.pdu_header.call_id = @call_id
-
-        # The server should not respond
-        send_packet(rpc_auth3)
-        @call_id += 1
-
-        nil
-      end
-
-      # Bind to the remote server interface endpoint. It takes care of adding
-      # the necessary authentication verifier if `:auth_level` is set to
-      # anything different than RPC_C_AUTHN_LEVEL_NONE
-      #
-      # @param endpoint [Module] the endpoint to bind to. This must be a Dcerpc
-      #   class with UUID, VER_MAJOR and VER_MINOR constants defined.
-      # @param auth_level [Integer] the authentication level
-      # @param auth_type [Integer] the authentication type
-      # @return [BindAck] the BindAck response packet
-      # @raise [Error::InvalidPacket] if an invalid packet is received
-      # @raise [Error::BindError] if the response is not a BindAck packet or if the Bind result code is not ACCEPTANCE
-      # @raise [ArgumentError] if `:auth_type` is unknown
-      # @raise [NotImplementedError] if `:auth_type` is not implemented (yet)
-      def bind(endpoint: @endpoint, auth_level: RPC_C_AUTHN_LEVEL_NONE, auth_type: nil)
-        bind_req = Bind.new(endpoint: endpoint)
-        bind_req.pdu_header.call_id = @call_id
-        # TODO: evasion: generate random UUIDs for bogus binds
-
-        if auth_level && auth_level != RPC_C_AUTHN_LEVEL_NONE
-          case auth_type
-          when RPC_C_AUTHN_WINNT, RPC_C_AUTHN_DEFAULT
-            raise ArgumentError, "NTLM Client not initialized. Username and password must be provided" unless @ntlm_client
-            type1_message = @ntlm_client.init_context
-            auth = type1_message.serialize
-          when RPC_C_AUTHN_GSS_KERBEROS, RPC_C_AUTHN_NETLOGON, RPC_C_AUTHN_GSS_NEGOTIATE
-          when RPC_C_AUTHN_GSS_KERBEROS, RPC_C_AUTHN_NETLOGON, RPC_C_AUTHN_GSS_NEGOTIATE, RPC_C_AUTHN_GSS_SCHANNEL
-            # TODO
-            raise NotImplementedError
-          else
-            raise ArgumentError, "Unsupported Auth Type: #{auth_type}"
-          end
-          add_auth_verifier(bind_req, auth, auth_type, auth_level)
-        end
-
-        send_packet(bind_req)
-        bindack_response = recv_struct(BindAck)
-        # TODO: see if BindNack response should be handled too
-
-        res_list = bindack_response.p_result_list
-        if res_list.n_results == 0 ||
-           res_list.p_results[0].result != BindAck::ACCEPTANCE
-          raise Error::BindError,
-            "Bind Failed (Result: #{res_list.p_results[0].result}, Reason: #{res_list.p_results[0].reason})"
-        end
-
-        @max_buffer_size = bindack_response.max_xmit_frag
-        @call_id = bindack_response.pdu_header.call_id
-
-        if auth_level && auth_level != RPC_C_AUTHN_LEVEL_NONE
-           # The number of legs needed to build the security context is defined
-           # by the security provider
-           # (see [2.2.1.1.7 Security Providers](https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-rpce/d4097450-c62f-484b-872f-ddf59a7a0d36))
-          case auth_type
-          when RPC_C_AUTHN_WINNT
-            send_auth3(bindack_response, auth_type, auth_level)
-          when RPC_C_AUTHN_GSS_KERBEROS, RPC_C_AUTHN_NETLOGON, RPC_C_AUTHN_GSS_NEGOTIATE
-            # TODO
-            raise NotImplementedError
-          end
-        end
-
-        nil
-      end
-
-      # Extract and store useful information about the peer/server from the
-      # NTLM Type 2 (challenge) TargetInfo fields.
-      #
-      # @param target_info_str [String] the Target Info string
-      def store_target_info(target_info_str)
-        target_info = Net::NTLM::TargetInfo.new(target_info_str)
-        {
-          Net::NTLM::TargetInfo::MSV_AV_NB_COMPUTER_NAME  => :@default_name,
-          Net::NTLM::TargetInfo::MSV_AV_NB_DOMAIN_NAME    => :@default_domain,
-          Net::NTLM::TargetInfo::MSV_AV_DNS_COMPUTER_NAME => :@dns_host_name,
-          Net::NTLM::TargetInfo::MSV_AV_DNS_DOMAIN_NAME   => :@dns_domain_name,
-          Net::NTLM::TargetInfo::MSV_AV_DNS_TREE_NAME     => :@dns_tree_name
-        }.each do |constant, attribute|
-          if target_info.av_pairs[constant]
-            value = target_info.av_pairs[constant].dup
-            value.force_encoding('UTF-16LE')
-            instance_variable_set(attribute, value.encode('UTF-8'))
-          end
-        end
-      end
-
-      # Extract the peer/server version number from the NTLM Type 2 (challenge)
-      # Version field.
-      #
-      # @param version [String] the version number as a binary string
-      # @return [String] the formated version number (<major>.<minor>.<build>)
-      def extract_os_version(version)
-        #version.unpack('CCS').join('.')
-        begin
-          os_version = NTLM::OSVersion.read(version)
-        rescue IOError
-          return ''
-        end
-        return "#{os_version.major}.#{os_version.minor}.#{os_version.build}"
-      end
-
-      # Add the authentication verifier to a Request packet. This includes a
-      # sec trailer and the signature of the packet. This also encrypts the
-      # Request stub if privacy is required (`:auth_level` option is
-      # RPC_C_AUTHN_LEVEL_PKT_PRIVACY).
-      #
-      # @param dcerpc_req [Request] the Request packet to be updated
-      # @param opts [Hash] the authenticaiton options: `:auth_type` and `:auth_level`
-      # @raise [NotImplementedError] if `:auth_type` is not implemented (yet)
-      # @raise [ArgumentError] if `:auth_type` is unknown
-      def set_integrity_privacy(dcerpc_req, auth_level:, auth_type:)
-        dcerpc_req.sec_trailer = {
-          auth_type: auth_type,
-          auth_level: auth_level,
-          auth_context_id: @ctx_id + @auth_ctx_id_base
-        }
-        dcerpc_req.auth_value = ' ' * 16
-        dcerpc_req.pdu_header.auth_length = 16
-
-        data_to_sign = plain_stub = dcerpc_req.stub.to_binary_s + dcerpc_req.auth_pad.to_binary_s
-        if @ntlm_client.flags & NTLM::NEGOTIATE_FLAGS[:EXTENDED_SECURITY] != 0
-          data_to_sign = dcerpc_req.to_binary_s[0..-(dcerpc_req.pdu_header.auth_length + 1)]
-        end
-
-        encrypted_stub = ''
-        if auth_level == RPC_C_AUTHN_LEVEL_PKT_PRIVACY
-          case auth_type
-          when RPC_C_AUTHN_NONE
-          when RPC_C_AUTHN_WINNT, RPC_C_AUTHN_DEFAULT
-            encrypted_stub = @ntlm_client.session.seal_message(plain_stub)
-          when RPC_C_AUTHN_NETLOGON, RPC_C_AUTHN_GSS_NEGOTIATE, RPC_C_AUTHN_GSS_SCHANNEL, RPC_C_AUTHN_GSS_KERBEROS
-            # TODO
-            raise NotImplementedError
-          else
-            raise ArgumentError, "Unsupported Auth Type: #{auth_type}"
-          end
-        end
-
-        signature = @ntlm_client.session.sign_message(data_to_sign)
-
-        unless encrypted_stub.empty?
-          pad_length = dcerpc_req.sec_trailer.auth_pad_length.to_i
-          dcerpc_req.enable_encrypted_stub
-          dcerpc_req.stub = encrypted_stub[0..-(pad_length + 1)]
-          dcerpc_req.auth_pad = encrypted_stub[-(pad_length)..-1]
-        end
-        dcerpc_req.auth_value = signature
-        dcerpc_req.pdu_header.auth_length = signature.size
-      end
-
       # Send a DCERPC request with the provided stub packet.
       #
       # @param stub_packet [BinData::Record] the stub packet to be sent as
@@ -482,60 +281,6 @@ module RubySMB
         raise Error::CommunicationError, "An error occurred reading from the Socket: #{e.message}"
       end
 
-      # Process the security context received in a response. It decrypts the
-      # encrypted stub if `:auth_level` is set to anything different than
-      # RPC_C_AUTHN_LEVEL_PKT_PRIVACY. It also checks the packet signature and
-      # raises an InvalidPacket error if it fails. Note that the exception is
-      # disabled by default and can be enabled with the
-      # `:raise_signature_error` option
-      #
-      # @param dcerpc_response [Response] the Response packet
-      #   containing the security context to process
-      # @param opts [Hash] the authenticaiton options: `:auth_type` and
-      #   `:auth_level`. To enable errors when signature check fails, set the
-      #   `:raise_signature_error` option to true
-      # @raise [NotImplementedError] if `:auth_type` is not implemented (yet)
-      # @raise [Error::CommunicationError] if socket-related error occurs
-      def handle_integrity_privacy(dcerpc_response, auth_level:, auth_type:, raise_signature_error: false)
-        decrypted_stub = ''
-        if auth_level == RPC_C_AUTHN_LEVEL_PKT_PRIVACY
-          encrypted_stub = dcerpc_response.stub.to_binary_s + dcerpc_response.auth_pad.to_binary_s
-          case auth_type
-          when RPC_C_AUTHN_NONE
-          when RPC_C_AUTHN_WINNT, RPC_C_AUTHN_DEFAULT
-            decrypted_stub = @ntlm_client.session.unseal_message(encrypted_stub)
-          when RPC_C_AUTHN_NETLOGON, RPC_C_AUTHN_GSS_NEGOTIATE, RPC_C_AUTHN_GSS_SCHANNEL, RPC_C_AUTHN_GSS_KERBEROS
-            # TODO
-            raise NotImplementedError
-          else
-            raise ArgumentError, "Unsupported Auth Type: #{auth_type}"
-          end
-        end
-
-        unless decrypted_stub.empty?
-          pad_length = dcerpc_response.sec_trailer.auth_pad_length.to_i
-          dcerpc_response.stub = decrypted_stub[0..-(pad_length + 1)]
-          dcerpc_response.auth_pad = decrypted_stub[-(pad_length)..-1]
-        end
-
-        signature = dcerpc_response.auth_value
-        data_to_check = dcerpc_response.stub.to_binary_s
-        if @ntlm_client.flags & NTLM::NEGOTIATE_FLAGS[:EXTENDED_SECURITY] != 0
-          data_to_check = dcerpc_response.to_binary_s[0..-(dcerpc_response.pdu_header.auth_length + 1)]
-        end
-        unless @ntlm_client.session.verify_signature(signature, data_to_check)
-          if raise_signature_error
-            raise Error::InvalidPacket.new(
-              "Wrong packet signature received (set `raise_signature_error` to false to ignore)"
-            )
-          end
-        end
-
-        @call_id += 1
-
-        nil
-      end
-
     end
   end
 end

data/lib/ruby_smb/dcerpc/error.rb

@@ -57,6 +57,16 @@ module RubySMB
           super(msg)
         end
       end
+
+      class IcprError < DcerpcError
+        include RubySMB::Error::UnexpectedStatusCode::Mixin
+
+        def initialize(msg, status_code: nil)
+          self.status_code = status_code unless status_code.nil?
+
+          super(msg)
+        end
+      end
     end
   end
 end

data/lib/ruby_smb/dcerpc/icpr/cert_server_request_request.rb

@@ -0,0 +1,27 @@
+require 'ruby_smb/dcerpc/ndr'
+
+module RubySMB
+  module Dcerpc
+    module Icpr
+
+      # [3.2.4.1.1 CertServerRequest (Opnum 0)](https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-icpr/0c6f150e-3ead-4006-b37f-ebbf9e2cf2e7)
+      class CertServerRequestRequest < BinData::Record
+        attr_reader :opnum
+
+        endian :little
+
+        ndr_uint32           :dw_flags
+        ndr_wide_stringz_ptr :pwsz_authority
+        ndr_uint32           :pdw_request_id
+        cert_trans_blob      :pctb_attribs
+        cert_trans_blob      :pctb_request
+
+        def initialize_instance
+          super
+          @opnum = CERT_SERVER_REQUEST
+        end
+      end
+
+    end
+  end
+end

data/lib/ruby_smb/dcerpc/icpr/cert_server_request_response.rb

@@ -0,0 +1,28 @@
+require 'ruby_smb/dcerpc/ndr'
+
+module RubySMB
+  module Dcerpc
+    module Icpr
+
+      # [3.2.4.1.1 CertServerRequest (Opnum 0)](https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-icpr/0c6f150e-3ead-4006-b37f-ebbf9e2cf2e7)
+      class CertServerRequestResponse < BinData::Record
+        attr_reader :opnum
+
+        endian :little
+
+        ndr_uint32      :pdw_request_id
+        ndr_uint32      :pdw_disposition
+        cert_trans_blob :pctb_cert
+        cert_trans_blob :pctb_encoded_cert
+        cert_trans_blob :pctb_disposition_message
+        ndr_uint32      :error_status
+
+        def initialize_instance
+          super
+          @opnum = CERT_SERVER_REQUEST
+        end
+      end
+
+    end
+  end
+end

data/lib/ruby_smb/dcerpc/icpr.rb

@@ -0,0 +1,84 @@
+module RubySMB
+  module Dcerpc
+    module Icpr
+
+      # [3.2.4.1 ICertPassage Interface](https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-icpr/d98e6cfb-87ba-4915-b3ec-a1b7c6129a53)
+      UUID = '91ae6020-9e3c-11cf-8d7c-00aa00c091be'
+      VER_MAJOR = 0
+      VER_MINOR = 0
+
+      # Operation numbers
+      CERT_SERVER_REQUEST = 0x0000
+
+      # Disposition constants, see
+      # [3.2.1.4.2.1 ICertRequestD::Request (Opnum 3)](https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-wcce/dbb2e78f-7630-4615-92c4-6734fccfc5a6)
+      CR_DISP_ISSUED           = 0x0003
+      CR_DISP_UNDER_SUBMISSION = 0x0005
+
+      # [2.2.2.2 CERTTRANSBLOB](https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-wcce/d6bee093-d862-4122-8f2b-7b49102097dc)
+      # (actually defined in MS-WCCE)
+      class CertTransBlob < Ndr::NdrStruct
+        endian :little
+        default_parameter  byte_align: 4
+
+        ndr_uint32              :cb, initial_value: -> { pb.length }
+        ndr_byte_conf_array_ptr :pb
+
+        def buffer
+          pb.to_ary.pack('C*')
+        end
+      end
+
+      require 'ruby_smb/dcerpc/icpr/cert_server_request_request'
+      require 'ruby_smb/dcerpc/icpr/cert_server_request_response'
+
+      def cert_server_request(attributes:, authority:, csr:)
+        cert_server_request_request = CertServerRequestRequest.new(
+          pwsz_authority: authority,
+          pctb_attribs: { pb: (attributes.map { |k,v| "#{k}:#{v}" }.join("\n").encode('UTF-16le').force_encoding('ASCII-8bit') + "\x00\x00".b) },
+          pctb_request: { pb: csr.to_der }
+        )
+
+        response = dcerpc_request(
+          cert_server_request_request,
+          auth_level: RubySMB::Dcerpc::RPC_C_AUTHN_LEVEL_PKT_PRIVACY,
+          auth_type: RubySMB::Dcerpc::RPC_C_AUTHN_WINNT
+        )
+        begin
+          cert_server_request_response = CertServerRequestResponse.read(response)
+        rescue IOError
+          raise RubySMB::Dcerpc::Error::InvalidPacket, 'Error reading CertServerRequestResponse'
+        end
+
+        ret = {
+          disposition: cert_server_request_response.pdw_disposition.value,
+          disposition_message: cert_server_request_response.pctb_disposition_message.buffer.chomp("\x00\x00").force_encoding('utf-16le').encode,
+          status: {
+            CR_DISP_ISSUED => :issued,
+            CR_DISP_UNDER_SUBMISSION => :submitted,
+          }.fetch(cert_server_request_response.pdw_disposition.value, :error)
+        }
+
+        # note: error_status == RPC_S_BINDING_HAS_NO_AUTH when not properly bound
+        if ret[:status] == :error
+          unless cert_server_request_response.error_status == WindowsError::NTStatus::STATUS_SUCCESS
+            error_status = cert_server_request_response.error_status.value
+            status_code = WindowsError::Win32.find_by_retval(error_status).first
+            if status_code.nil? && (fault_name = RubySMB::Dcerpc::Fault::Status.name(error_status))
+              status_code = WindowsError::ErrorCode.new(fault_name.to_s, error_status, 'DCERPC fault')
+            end
+            raise RubySMB::Dcerpc::Error::IcprError.new(
+              "Error returned with cert_server_request: #{status_code || "0x#{error_status.to_s(16).rjust(8, '0')}"}",
+              status_code: status_code
+            )
+          end
+        else
+          ret[:certificate] = OpenSSL::X509::Certificate.new(cert_server_request_response.pctb_encoded_cert.buffer)
+        end
+
+        ret
+      end
+
+    end
+  end
+end

data/lib/ruby_smb/dcerpc/ndr.rb

@@ -1208,14 +1208,50 @@ module RubySMB::Dcerpc::Ndr
     extend PointerClassPlugin
   end
 
+
+  # ArrayPtr definitions:
+  #   If the type is Ndr*ArrayPtr, it's a ConfVarArray (Uni-dimensional Conformant-varying Array)
+  #   If the type is Ndr*ConfArrayPtr, it's a ConfArray (Uni-dimensional Conformant Array)
   class NdrByteArrayPtr < NdrConfVarArray
     default_parameters type: :ndr_uint8
     extend PointerClassPlugin
+
+    def assign(val)
+      val = val.bytes if val.is_a?(String)
+      super(val.to_ary)
+    end
   end
 
-  class NdrUint16ArrayPtr < NdrConfVarArray
-    default_parameters type: :ndr_uint16
+  class NdrByteConfArrayPtr < NdrConfArray
+    default_parameters type: :ndr_uint8
     extend PointerClassPlugin
+
+    def assign(val)
+      val = val.bytes if val.is_a?(String)
+      super(val.to_ary)
+    end
+  end
+
+  %i[ Uint8 Uint16 Uint32 Uint64 ].each do |klass|
+    new_klass_name = "Ndr#{klass}ArrayPtr"
+    unless self.const_defined?(new_klass_name)
+      new_klass = Class.new(NdrConfVarArray) do
+        default_parameters type: "ndr_#{klass}".downcase.to_sym
+        extend PointerClassPlugin
+      end
+      self.const_set(new_klass_name, new_klass)
+      BinData::RegisteredClasses.register(new_klass_name, new_klass)
+    end
+
+    new_klass_name = "Ndr#{klass}ConfArrayPtr"
+    unless self.const_defined?(new_klass_name)
+      new_klass = Class.new(NdrConfArray) do
+        default_parameters type: "ndr_#{klass}".downcase.to_sym
+        extend PointerClassPlugin
+      end
+      self.const_set(new_klass_name, new_klass)
+      BinData::RegisteredClasses.register(new_klass_name, new_klass)
+    end
   end
 
   class NdrFileTimePtr < NdrFileTime

data/lib/ruby_smb/dcerpc/request.rb

@@ -97,6 +97,10 @@ module RubySMB
           netr_dfs_remove_std_root_request Dfsnm::NETR_DFS_REMOVE_STD_ROOT
           string                           :default
         end
+        choice 'Icpr', selection: -> { opnum } do
+          cert_server_request_request      Icpr::CERT_SERVER_REQUEST
+          string                           :default
+        end
         string :default
       end
       string      :auth_pad,