@@ -6,13 +6,13 @@ deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. COPYING @@ -68,7 +68,7 @@ module Atom response = kd(h(a1), params[:nonce] + ":" + h(a2)) else @@nonce_count += 1 - nc = ('%08x' % @@nonce_count) + nc = ('%08x' % @@nonce_count) # XXX auth-int data = "#{params[:nonce]}:#{nc}:#{CNONCE}:#{"auth"}:#{h(a2)}" @@ -77,7 +77,7 @@ module Atom end header = %Q<Digest username="#{user}", uri="#{req.path}", realm="#{params[:realm]}", response="#{response}", nonce="#{params[:nonce]}"> - + if params[:opaque] header += %Q<, opaque="#{params[:opaque]}"> end @@ -107,7 +107,7 @@ module Atom # # This object can be used on its own, or passed to an Atom::Service, # Atom::Collection or Atom::Feed, where it will be used for requests. - # + # # All its HTTP methods return a Net::HTTPResponse class HTTP include DigestAuth @@ -118,14 +118,14 @@ module Atom # the token used for Google's AuthSub authentication attr_accessor :token - # when set to :basic, :wsse or :authsub, this will send an - # Authentication header with every request instead of waiting for a - # challenge from the server. - # + # when set to :basic, :wsse or :authsub, this will send an + # Authentication header with every request instead of waiting for a + # challenge from the server. + # # be careful; always_auth :basic will send your username and # password in plain text to every URL this object requests. # - # :digest won't work, since Digest authentication requires an + # :digest won't work, since Digest authentication requires an # initial challenge to generate a response # # defaults to nil @@ -249,7 +249,7 @@ module Atom now = Time.now.gmtime.iso8601 digest = [Digest::SHA1.digest(nonce + now + pass)].pack("m").chomp - + req['X-WSSE'] = %Q<UsernameToken Username="#{user}", PasswordDigest="#{digest}", Nonce="#{nonce_enc}", Created="#{now}"> req["Authorization"] = 'WSSE profile="UsernameToken"' end @@ -304,7 +304,7 @@ module Atom end req, url = new_request(url_s, method, headers) - + # two reasons to authenticate; if @always_auth self.send("#{@always_auth}_authenticate", req, url) @@ -324,7 +324,7 @@ module Atom case res when Net::HTTPUnauthorized - if @always_auth or www_authenticate or not res["WWW-Authenticate"] # XXX and not stale (Digest only) + if @always_auth or www_authenticate or not res["WWW-Authenticate"] # XXX and not stale (Digest only) # we've tried the credentials you gave us once # and failed, or the server gave us no way to fix it raise Unauthorized, "Your authorization was rejected" @@ -361,12 +361,12 @@ module Atom res end - + def new_request(url_string, method, init_headers = {}) headers = { "User-Agent" => UA }.merge(init_headers) - + url = url_string.to_uri - + rel = url.path rel += "?" + url.query if url.query lib/atom/http.rb @@ -208,7 +208,7 @@ module Atom atom = REXML::XPath.first(doc, '/rsd/service/apis/api[@name="Atom"]') unless atom - raise AutodiscoveryFailure "couldn't find an Atom link in the RSD" + raise AutodiscoveryFailure, "couldn't find an Atom link in the RSD" end url = url.to_uri + atom.attributes['apiLink'] lib/atom/service.rb c6733a543ba1f420df4430bc515ec04fdb23db48 Brendan Taylor whateley@gmail.com http://github.com/bct/atom-tools/commit/e4d84be054d099db65b95c82304cfc1f8fcb2085 e4d84be054d099db65b95c82304cfc1f8fcb2085 2008-02-20T20:19:04-08:00 2008-02-20T20:19:04-08:00 whitespace cleanup and a teensy-tiny bugfix darcs-hash:20080221041904-ce558-3ec10b6986a5f35b13eea803ad37fc646c3665e5.gz a24b906700f84eeeff772813278e85a1fd8fbd06 Brendan Taylor whateley@gmail.com