postgres-pr 0.1.1 → 0.2.0

data/lib/postgres-pr/connection.rb

@@ -14,7 +14,7 @@ class Connection
 
   # sync
 
-  def initialize(database, user, auth=nil, uri = nil)
+  def initialize(database, user, password=nil, uri = nil)
     uri ||= "unix:/tmp/.s.PGSQL.5432"
 
     raise unless @mutex.nil?
@@ -29,10 +29,31 @@ class Connection
 
       loop do
         msg = Message.read(@conn)
+
         case msg
+        when AuthentificationClearTextPassword
+          raise ArgumentError, "no password specified" if password.nil?
+          @conn << PasswordMessage.new(password).dump
+
+        when AuthentificationCryptPassword
+          raise ArgumentError, "no password specified" if password.nil?
+          @conn << PasswordMessage.new(password.crypt(msg.salt)).dump
+
+        when AuthentificationMD5Password
+          raise ArgumentError, "no password specified" if password.nil?
+          require 'digest/md5'
+
+          m = Digest::MD5.hexdigest(password + user) 
+          m = Digest::MD5.hexdigest(m + msg.salt)
+          m = 'md5' + m
+          @conn << PasswordMessage.new(m).dump
+
+        when AuthentificationKerberosV4, AuthentificationKerberosV5, AuthentificationSCMCredential
+          raise "unsupported authentification"
+
         when AuthentificationOk
         when ErrorResponse
-          raise
+          raise "authentification failed"
         when NoticeResponse
           # TODO
         when ParameterStatus
@@ -62,6 +83,7 @@ class Connection
       @conn << Query.dump(sql)
 
       result = Result.new
+      errors = []
 
       loop do
         msg = Message.read(@conn)
@@ -78,13 +100,16 @@ class Connection
         when EmptyQueryResponse
         when ErrorResponse
           # TODO
-          raise msg.inspect
+          errors << msg
         when NoticeResponse
           p msg
         else
           # TODO
         end
       end
+
+      raise errors.map{|e| e.inspect}.join("   ") unless errors.empty?
+
       result
     }
   end

data/lib/postgres-pr/message.rb

@@ -183,6 +183,23 @@ class AuthentificationSCMCredential < Authentification
   register_auth_type 6
 end
 
+class PasswordMessage < Message
+  register_message_type ?p
+  fields :password
+
+  def dump
+    super(@password.size + 1) do |buffer|
+      buffer.write_cstring(@password)
+    end
+  end
+
+  def parse(buffer)
+    super do
+      @password = buffer.read_cstring
+    end
+  end
+end
+
 class ParameterStatus < Message
   register_message_type ?S
   fields :key, :value
@@ -473,3 +490,33 @@ class StartupMessage < Message
     raise ParseError unless buffer.at_end?
   end
 end
+
+class SSLRequest < Message
+  fields :ssl_request_code
+
+  def dump
+    sz = 4 + 4
+    buffer = Buffer.new(sz)
+    buffer.write_int32_network(sz)
+    buffer.write_int32_network(@ssl_request_code)
+    raise DumpError unless buffer.at_end?
+    return buffer.content
+  end
+
+  def parse(buffer)
+    buffer.position = 4
+    @ssl_request_code = buffer.read_int32_network
+    raise ParseError unless buffer.at_end?
+  end
+end
+
+=begin
+# TODO: duplicate message-type, split into client/server messages
+class Sync < Message
+  register_message_type ?S
+end
+=end
+
+class Terminate < Message
+  register_message_type ?X
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.1
 specification_version: 1
 name: postgres-pr
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2004-11-18
+  version: 0.2.0
+date: 2004-11-19
 summary: A pure Ruby interface to the PostgreSQL database
 require_paths: 
   - lib