quaff 0.7.1 → 0.7.2pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a8712d73990e1e8deda860a69f809f469df1d3c
-  data.tar.gz: 26bc29589ac1c2617e87e69e84a64452e3b07f8a
+  metadata.gz: 9047b18e78c395218140978669aa414fc4b7b37c
+  data.tar.gz: 6da528c0f5bb692af431c4baa4d1ebfe578dfd27
 SHA512:
-  metadata.gz: 1283c0cc9af8d4b41560a6f5ea1aeb28cabe90f329f64a49858c28d55f4bbf77af1895c4ea50cdc6189419612dd4dabfcc2c2ebc6a9c2c58895c9d8ae46d916e
-  data.tar.gz: f3e9ff6fb9a817144032e1d9c579f036b0ad5712d682d6675b95464b03dcfc6f406625099089eccb2f37dfa5acf68c5e1dc3c3c3a9aba8d380067b14152df234
+  metadata.gz: 6122a94c660e04af275f68577fa14692e3a3b07b4d89f313ff2b8ccd0ea12d26f823e6039eea444388b65055f42e816289dffd5d51b4344ee5a12d06e81624fa
+  data.tar.gz: 43ea4996f3fb844e64a860067d577b3910b6358664ff8ec4e17a370d64b6f99f1bb4e21363d1346f758eb82d190708d8a334ac18f993a9ba6866394c109135b3

data/lib/auth.rb

@@ -2,10 +2,12 @@ require 'base64'
 
 module Quaff
   module Auth #:nodoc:
-    def Auth.gen_nonce auth_pairs, username, passwd, method, sip_uri
-      a1 = username + ":" + auth_pairs["realm"] + ":" + passwd
+    def Auth.gen_nonce auth_pairs, username, passwd, method, sip_uri, ha1=""
+      if ha1.empty?
+        a1 = username + ":" + auth_pairs["realm"] + ":" + passwd
+        ha1 = Digest::MD5::hexdigest(a1)
+      end
       a2 = method + ":" + sip_uri
-      ha1 = Digest::MD5::hexdigest(a1)
       ha2 = Digest::MD5::hexdigest(a2)
       digest = Digest::MD5.hexdigest(ha1 + ":" + auth_pairs["nonce"] + ":" + ha2)
       return digest
@@ -29,14 +31,14 @@ module Quaff
       # the SIP URI
     end
 
-    def Auth.gen_auth_header auth_line, username, passwd, method, sip_uri
+    def Auth.gen_auth_header auth_line, username, passwd, method, sip_uri, ha1=""
       # Split auth line on commas
       auth_pairs = {}
       auth_line.sub("Digest ", "").split(",") .each do |pair|
         key, value = pair.split "="
         auth_pairs[key.gsub(" ", "")] = value.gsub("\"", "").gsub(" ", "")
       end
-      digest = gen_nonce auth_pairs, username, passwd, method, sip_uri
+      digest = gen_nonce auth_pairs, username, passwd, method, sip_uri, ha1
       return %Q!Digest username="#{username}",realm="#{auth_pairs['realm']}",nonce="#{auth_pairs['nonce']}",uri="#{sip_uri}",response="#{digest}",algorithm="#{auth_pairs['algorithm']}",opaque="#{auth_pairs['opaque']}"!
       # Return Authorization header with fields username, realm, nonce, uri, nc, cnonce, response, opaque
     end

data/lib/call.rb

@@ -25,7 +25,7 @@ module Quaff
   end
 
 class Call
-  attr_reader :cid
+  attr_reader :cid, :last_To, :last_From, :sip_destination
 
   def initialize(cxn,
                  cid,

data/lib/endpoint.rb

@@ -4,14 +4,14 @@ require 'thread'
 require 'timeout'
 require 'resolv'
 require 'securerandom'
-#require 'milenage'
 require_relative './sip_parser.rb'
 require_relative './sources.rb'
 require 'digest/md5'
+require 'stringio'
 
 module Quaff
   class BaseEndpoint
-    attr_accessor :msg_trace, :uri, :sdp_port, :sdp_socket
+    attr_accessor :msg_trace, :uri, :sdp_port, :sdp_socket, :local_hostname
     attr_reader :msg_log, :local_port, :instance_id
 
     # Creates an SDP socket bound to an ephemeral port
@@ -105,6 +105,7 @@ module Quaff
       @resolver = Resolv::DNS.new
       @username = username
       @password = password
+      @local_host = Utils::local_ip
       @local_port = local_port
       initialize_connection
       if outbound_proxy
@@ -114,6 +115,7 @@ module Quaff
       @contact_params = {}
       @contact_uri_params = {"transport" => transport, "ob" => true}
       @terminated = false
+      @local_hostname = Utils::local_ip
       initialize_queues
       start
     end
@@ -121,7 +123,7 @@ module Quaff
     def contact_header
       param_str = Utils.paramhash_to_str(@contact_params)
       uri_param_str = Utils.paramhash_to_str(@contact_uri_params)
-      "<sip:quaff@#{Utils::local_ip}:#{@local_port}#{uri_param_str}>#{param_str}"
+      "<sip:quaff@#{@local_hostname}:#{@local_port}#{uri_param_str}>#{param_str}"
     end
 
     def send_msg(data, source) # :nodoc:
@@ -311,12 +313,8 @@ module Quaff
     end
 
     def recv_msg_from_sock(sock)
-      @parser.parse_start
-      msg = nil
-      while msg.nil? and not sock.closed? do
-        line = sock.gets
-        msg = @parser.parse_partial line
-      end
+      msg = @parser.parse_from_io(sock)
+      
       queue_msg msg, TCPSourceFromSocket.new(sock)
     end
   end
@@ -352,10 +350,10 @@ module Quaff
     end
 
     def recv_msg
-        data, addrinfo = @cxn.recvfrom(65535)
-        @parser.parse_start
-        msg = @parser.parse_partial(data)
-        queue_msg msg, UDPSourceFromAddrinfo.new(addrinfo) unless msg.nil?
+      data, addrinfo = @cxn.recvfrom(65535)
+      @parser.parse_start
+      msg = @parser.parse_from_io(StringIO(data))
+      queue_msg msg, UDPSourceFromAddrinfo.new(addrinfo) unless msg.nil?
     end
   end
 

data/lib/message.rb

@@ -8,7 +8,7 @@ class SipMessage
     @headers = headers
     @method, @status_code, @reason, @requri = method, status_code, reason, req_uri
     @body = body
-    @headers['Content-Length'] = [body.length]
+    @headers['Content-Length'] = [body.length.to_s]
   end
 
   def [] key

data/lib/sip_parser.rb

@@ -3,100 +3,117 @@ require 'digest/md5'
 require 'abnf'
 require_relative './message.rb'
 
+# The valid states for the parser:
+# :blank
+# :parsing_headers
+# :waiting_for_body
+# :done
+
 module Quaff
   class SipParser # :nodoc:
     attr_reader :state
-    def parse_start
-      @buf = ""
-      @msg = SipMessage.new
+    def initialize
       @state = :blank
+      @msg = SipMessage.new
     end
 
-    def parse_partial(data)
-      return nil if data.nil?
-      data.lines.each do |line|
-        line.rstrip!
-        if @state == :blank
-          parse_line_blank line
-        elsif @state == :parsing_body
-          parse_line_body line
-        else
-          parse_line_first_line_parsed line
-        end
+    def parse_from_io(io, udp=false)
+      parse_start
+
+      parse_initial_line(io.gets.rstrip)
+      while @state == :parsing_headers and not io.closed? do
+        parse_header_line io.gets.rstrip
       end
-      if @state == :done
-        return @msg
-      else
-        return nil
+
+      if io.closed?
+        raise "Socket closed unexpectedly!"
       end
+
+      if @state == :waiting_for_body
+        body = io.read(body_length)
+        add_body body
+      elsif udp and msg.header("Content-Length").nil?
+        add_body io.read(1500)
+      end        
+      @msg
+    end
+
+    def parse_start
+      @msg = SipMessage.new
+      @state = :blank
     end
 
     def message_identifier(msg)
       msg.header("Call-ID")
     end
 
-    def parse_line_blank line
-      if line == ""
-        # skip empty lines
-        return
+    def body_length
+      if @msg.header("Content-Length")
+        @msg.header("Content-Length").to_i
       else
-        parts = line.split " ", 3
-        if parts[2] == "SIP/2.0"
-          # Looks like a SIP request
-          @msg.method = parts[0]
-          @msg.requri = parts[1]
-          @state = :first_line_parsed
-          return
-        elsif parts[0] == "SIP/2.0"
-          # Looks like a SIP response
-          @msg.status_code = parts[1]
-          @msg.reason = parts[2] || ""
-          @state = :first_line_parsed
-          return
-        else
-          raise parts.inspect
-        end
+        0
       end
-      # We haven't returned, so looks like a malformed line
-      raise line.inspect
     end
 
-    def parse_line_first_line_parsed line
-      if line.start_with? " "
+    def parse_initial_line line
+      fail "Invalid state: #{@state}" unless @state == :blank
+      parts = line.split " ", 3
+      if parts[2] == "SIP/2.0"
+        # Looks like a SIP request
+        @msg.method = parts[0]
+        @msg.requri = parts[1]
+      elsif parts[0] == "SIP/2.0"
+        # Looks like a SIP response
+        @msg.status_code = parts[1]
+        @msg.reason = parts[2] || ""
+      else
+        raise parts.inspect
+      end
+      @state = :parsing_headers
+    end
+
+    def process_continuation_line line
         @msg.headers[@cur_hdr][-1] += " "
         @msg.headers[@cur_hdr][-1] += line.lstrip
+    end
+    
+    def parse_header_line line
+      fail "Invalid state: #{@state}" unless @state == :parsing_headers
+      if line == "" and (body_length == 0)
+        @state = :done
+      elsif line == ""
+        @state = :waiting_for_body
+      elsif line.start_with? " "
+        process_continuation_line line
       elsif line.include? ":"
         parts = line.split ":", 2
         header_name, header_value = parts[0].rstrip, parts[1].lstrip
         @msg.headers[header_name] ||= []
         @msg.headers[header_name].push header_value
-        @cur_hdr = header_name
+
         if header_name == "Content-Length"
-          @state = :got_content_length
+          # Special treatment - Content-Length defaults to 0 at
+          # creation, so has to be overwritten
           @msg.headers[header_name] = [header_value]
-        else
-          if (@state != :got_content_length)
-            @state = :middle_of_headers
-          end
         end
-      elsif line == ""
-        if (@state == :got_content_length) and (@msg.header("Content-Length").to_i > 0)
-          @state = :parsing_body
-        else
-          @state = :done
-        end
-      else raise line.inspect
+
+        @cur_hdr = header_name
+      else
+        raise line.inspect
       end
     end
 
-    def parse_line_body line
-      @msg.body << line
-      @msg.body << "\r\n"
-      if line == "" or @msg.body.length >= @msg.header("Content-Length").to_i
-        @state = :done
-      end
+    def add_body body
+      fail "Invalid state: #{@state}" unless (@state == :waiting_for_body || @state == :done)
+      @msg.body = body
+      @state = :done
     end
 
+    def msg
+      fail "Invalid state: #{@state}" unless @state == :done
+      @msg
+    end
+    
   end
 
   class ABNFSipParser # :nodoc:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quaff
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2pre1
 platform: ruby
 authors:
 - Rob Day
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-10 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: system-getifaddrs
@@ -82,9 +82,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.1.11