quaff 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 193de3492377eb5632711a50d13544aed7d6cdee
-  data.tar.gz: f4248258e480b0205f3724ae7da0c0b725868414
+  metadata.gz: dd835927c3eee7a4ba02cd376b8967d0cea3c5e8
+  data.tar.gz: bad0aed037d35fbbae1996f95e7145dab1d43543
 SHA512:
-  metadata.gz: 2bbf17a26f376dfe1808efc86de556bf4ee539df9d120d7b721c2b5912d5fb3acdbc609d1662a48adcd3b67e61aec4c513bb971f478e01931084fa080c03a9fd
-  data.tar.gz: dd93aa1e370a11157ee17179922c46b42c73cb7f9109a2158f4fa35f13a402e04c0808adb5a6e39d85294b065b8ed4bb5669a0e56f664d544cd9182abbe2bcbc
+  metadata.gz: 9e6aeafc9f296e0718b366ea52eb17943d79ccb207515d5ee85f9e128ef3fe7eaca03f3ca63a450beb46edf30ca04fdfe0505153e1c3cb23bfcd9ae2e7d3d0a9
+  data.tar.gz: e8ecea0abae1644e6494dcd9a3aadd1d647cbb479b7e2be29fbb2f1a27b235515ec4bfa37971e0335abaad245cac53be96d243d3447faf964d0a4f98c394455b

data/lib/auth.rb

@@ -2,14 +2,18 @@ require 'base64'
 
 module Quaff
   module Auth #:nodoc:
-    def Auth.gen_nonce auth_pairs, username, passwd, method, sip_uri, ha1=""
+    def Auth.gen_nonce auth_pairs, username, passwd, method, sip_uri, ha1="", qop="", nc=1, cnonce=""
       if ha1.empty?
         a1 = username + ":" + auth_pairs["realm"] + ":" + passwd
         ha1 = Digest::MD5::hexdigest(a1)
       end
       a2 = method + ":" + sip_uri
       ha2 = Digest::MD5::hexdigest(a2)
-      digest = Digest::MD5.hexdigest(ha1 + ":" + auth_pairs["nonce"] + ":" + ha2)
+      if qop == "auth"
+        digest = Digest::MD5.hexdigest(ha1 + ":" + auth_pairs["nonce"] + ":" + nc.to_s(16).rjust(8, "0") + ":" + cnonce + ":" + qop + ":" + ha2)
+      else
+        digest = Digest::MD5.hexdigest(ha1 + ":" + auth_pairs["nonce"] + ":" + ha2)
+      end
       return digest
     end
 
@@ -31,15 +35,22 @@ module Quaff
       # the SIP URI
     end
 
-    def Auth.gen_auth_header auth_line, username, passwd, method, sip_uri, ha1=""
+    def Auth.gen_auth_header auth_line, username, passwd, method, sip_uri, ha1="", qop="", nc=1, cnonce=""
       # 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, 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']}"!
+      if !qop.empty? and cnonce.empty?
+        cnonce = (0...16).map { (rand(16)).to_s(16) }.join
+      end
+      digest = gen_nonce auth_pairs, username, passwd, method, sip_uri, ha1, qop, nc, cnonce
+      if !qop.empty?
+        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']}",qop="#{qop}",nc="#{nc.to_s(16).rjust(8, "0")}",cnonce="#{cnonce}"!
+      else
+        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']}"!
+      end
       # Return Authorization header with fields username, realm, nonce, uri, nc, cnonce, response, opaque
     end
   end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: quaff
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Rob Day
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2016-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: system-getifaddrs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: milenage
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: abnf-parsing
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
 description: A Ruby library for writing SIP test scenarios
@@ -58,14 +58,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/sources.rb
+- lib/auth.rb
 - lib/call.rb
-- lib/utils.rb
-- lib/message.rb
 - lib/endpoint.rb
-- lib/sip_parser.rb
-- lib/auth.rb
+- lib/message.rb
 - lib/quaff.rb
+- lib/sip_parser.rb
+- lib/sources.rb
+- lib/utils.rb
 homepage: http://github.com/rkday/quaff
 licenses:
 - GPL3
@@ -77,17 +77,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Quaff