morhekil-ipcauthpipe 0.1 → 0.2

data/config.yml

@@ -14,6 +14,6 @@ invision:
 
 mail:
   address_format: %s@poker.ru
-  owner_username: saruman
+  owner_uid: 2001
   owner_gid: 1000
   home_dir: /tmp/%s

data/ipcauthpipe.gemspec

@@ -1,10 +1,8 @@
 Gem::Specification.new do |s|
   s.name     = "ipcauthpipe"
-  s.version  = "0.1"
-  s.date     = "2008-09-10"
+  s.version  = "0.2"
+  s.date     = "2008-09-18"
   s.summary  = "Implementation of Courier's authpipe protocol over Invision Power Board / Converge."
-  s.email    = "tom@rubyisawesome.com"
-  s.homepage = "http://github.com/schacon/grit"
   s.description = "ipcauthpipe gem implements Courier's authpipe protocol to interface Courier POP/IMAP server with Invision Power Board / Converge members database."
   s.has_rdoc = false
 

data/lib/ipcauthpipe.rb

@@ -26,7 +26,10 @@ module IpcAuthpipe
 
       ipc = IpcAuthpipe::Processor.new
       while (line = IpcAuthpipe::Reader.getline) do
-        puts ipc.process(line.strip) unless line.strip.empty?
+        reply = ipc.process(line.strip) unless line.strip.empty?
+        Log::debug "Reply is: #{reply.inspect}"
+        STDOUT.puts reply
+        STDOUT.flush
       end
     end
 
@@ -52,4 +55,4 @@ module IpcAuthpipe
 
   end
 
-end
+end

data/lib/ipcauthpipe/handler/auth.rb

@@ -19,8 +19,10 @@ module IpcAuthpipe
       # them up into a hash of parameters ready for further processing
       def getdata(count)
         Log.debug "Reading [#{count}] bytes from input stream"
-        splits = Reader::getbytes(count).strip.split(/\s+/m)
-        raise ArgumentError, 'Invalid AUTH payload' unless splits.size == 3
+        payload = Reader::getbytes(count)
+        Log.debug "AUTH payload is #{payload}"
+        splits = payload.strip.split(/\s+/m)
+        raise ArgumentError, 'Invalid AUTH payload' unless splits.size == 4
 
         Log.debug "Analyzing splits [#{splits.inspect}]"
         auth_method(splits)
@@ -30,11 +32,11 @@ module IpcAuthpipe
       # of :method, :username and :password for LOGIN authentication and
       # :method, :challenge and :response for CRAM-style authentications
       def auth_method(splits)
-        result = { :method => splits[0].strip.downcase }
+        result = { :method => splits[1].strip.downcase }
         result.merge!(
           result[:method] == 'login' ?
-            { :username => splits[1].strip, :password => splits[2].strip } :
-            { :challenge => splits[1].strip, :response => splits[2].strip }
+            { :username => splits[2].strip.split(/\@/)[0], :password => splits[3].strip } :
+            { :challenge => splits[2].strip, :response => splits[3].strip }
         )
         
         Log.debug "Converted splits into [#{result.inspect}]"
@@ -74,4 +76,4 @@ module IpcAuthpipe
     end
 
   end
-end
+end

data/lib/models/member.rb

@@ -15,9 +15,10 @@ class Member < ActiveRecord::Base
   def to_authpipe
     IpcAuthpipe::Log.debug "Dumping authpipe string for member data #{inspect}"
     stringdump = [
-      "USERNAME=#{IpcAuthpipe::config.mail['owner_username']}",
+      "UID=#{IpcAuthpipe::config.mail['owner_uid']}",
       "GID=#{IpcAuthpipe::config.mail['owner_gid']}",
-      "HOME=#{IpcAuthpipe::config.mail['home_dir'] % name}",
+      "HOME=#{IpcAuthpipe::config.mail['home_dir'] % name}/",
+      "MAILDIR=#{IpcAuthpipe::config.mail['home_dir'] % name}/",
       "ADDRESS=#{IpcAuthpipe::config.mail['address_format'] % name}",
       "."
     ].join("\n")+"\n"
@@ -25,4 +26,4 @@ class Member < ActiveRecord::Base
 
     stringdump
   end
-end
+end

data/test/config.yml

@@ -14,6 +14,6 @@ invision:
 
 mail:
   address_format: %s@poker.ru
-  owner_username: saruman
+  owner_uid: 2000
   owner_gid: 1000
   home_dir: /home/vmail/%s

data/test/ipcauthpipe/handler/auth_spec.rb

@@ -16,35 +16,35 @@ describe "AUTH handler" do
   end
 
   it "should read given number of bytes from the input stream and pass them onto the analyzer splitted into an array" do
-    IpcAuthpipe::Reader.should_receive(:getbytes).once.with(23).and_return("login \n vasya \n parol ")
+    IpcAuthpipe::Reader.should_receive(:getbytes).once.with(29).and_return("imap \nlogin \n vasya \n parol ")
     # we're expecting array as an argument for auth_method
     @auth.should_receive(:auth_method).once.with( duck_type(:is_array) )
-    @auth.getdata(23)
+    @auth.getdata(29)
   end
 
   it "should raise ArgumentError exception on invalid payload" do
-    IpcAuthpipe::Reader.should_receive(:getbytes).once.with(27).and_return("login \n vasya \n parol \n wtf")
-    lambda { @auth.getdata(27) }.should raise_error(ArgumentError)
+    IpcAuthpipe::Reader.should_receive(:getbytes).once.with(33).and_return("imap \nlogin \n vasya \n parol \n wtf")
+    lambda { @auth.getdata(33) }.should raise_error(ArgumentError)
   end
 
   it "should properly handle both CR-delimited and non-CR-delimited payloads" do
-    @auth.should_receive(:auth_method).twice.with(['login', 'vasya', 'parol'])
+    @auth.should_receive(:auth_method).twice.with(['imap', 'login', 'vasya', 'parol'])
 
-    IpcAuthpipe::Reader.should_receive(:getbytes).once.with(23).and_return("login \n vasya \n parol ")
-    @auth.getdata(23)
+    IpcAuthpipe::Reader.should_receive(:getbytes).once.with(29).and_return("imap \nlogin \n vasya \n parol ")
+    @auth.getdata(29)
 
-    IpcAuthpipe::Reader.should_receive(:getbytes).once.with(24).and_return("login \n vasya \n parol \n")
-    @auth.getdata(24)
+    IpcAuthpipe::Reader.should_receive(:getbytes).once.with(30).and_return("imap \nlogin \n vasya \n parol \n")
+    @auth.getdata(30)
   end
 
   it "should convert LOGIN's payload into a hash with username and password" do
-    @auth.auth_method( ['login', 'vasya', 'parol'] ).should == { 
+    @auth.auth_method( ['imap', 'login', 'vasya', 'parol'] ).should == {
       :method => 'login', :username => 'vasya', :password => 'parol'
     }
   end
 
   it "should convert CRAM's payload into a hash with challenge and response" do
-    @auth.auth_method( ['cram-md5', 'vasya', 'parol'] ).should == {
+    @auth.auth_method( ['imap', 'cram-md5', 'vasya', 'parol'] ).should == {
       :method => 'cram-md5', :challenge => 'vasya', :response => 'parol'
     }
   end

data/test/models/member_spec.rb

@@ -45,9 +45,10 @@ describe 'Member' do
     )
 
     member.to_authpipe.should == [
-      "USERNAME=#{IpcAuthpipe::config.mail['owner_username']}",
+      "UID=#{IpcAuthpipe::config.mail['owner_uid']}",
       "GID=#{IpcAuthpipe::config.mail['owner_gid']}",
-      "HOME=/home/vmail/tester",
+      "HOME=/home/vmail/tester/",
+      "MAILDIR=/home/vmail/tester/",
       "ADDRESS=tester@poker.ru",
       "."
     ].join("\n") + "\n"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: morhekil-ipcauthpipe
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: "0.2"
 platform: ruby
 authors: 
 - Oleg Ivanov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-10 00:00:00 -07:00
+date: 2008-09-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency