zimbra_intercepting_proxy 0.0.4.1 → 0.0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f345ce94138c1ff8efc2cd1b020262f422b6b28
-  data.tar.gz: 912237b2a69c2ff996817eec4ecbc002c9f378ca
+  metadata.gz: c43322897f826dfb60b13d7f600624311debaa4e
+  data.tar.gz: 52c6130238ffb9f4d7ab0be5a8381f8ac6238ed5
 SHA512:
-  metadata.gz: 651eddbf023bc51e68eb5de039d69d17d97366b694e7e52c6f287eab7206c56f15eb3d53c58d59ad2495fb3b55ac365e6af778af0c8ab52bb60b8241b3bcaf28
-  data.tar.gz: 8fed88b3459e1068fd4bdc0d8b8b5f482185fe2256268286598a6cbbc757ffceaaaf04ee0b21d728fd36856eb7ef5db3043c823e6f7af1a6eebff6c72ca73319
+  metadata.gz: 92ddfc17968639cc7a521e909df6519da27792647441c987571425f22013541348cb6284a103349fb344191d73176b2b0a2687f7a843a08aa06ae711aee58bc9
+  data.tar.gz: 85976c28eed04ae7b12e105638c7d2d5e44bde9e162467cf5058d4e34800c4925c42bd755134b97565df4fa3fce2ed91a961da309b65cdd8457afaa28443fd21

data/README.md

@@ -1,7 +1,12 @@
 # ZimbraInterceptingProxy
 
-TODO: Write a gem description
+This software is used to Intercept and Transform the traffic to and from the Zimbra Mailboxes when using a Zimbra Proxy.
+If you don't know what Zimbra Proxy is, You can read about it here: [https://wiki.zimbra.com/wiki/Zimbra_Proxy_Guide](https://wiki.zimbra.com/wiki/Zimbra_Proxy_Guide)
 
+## What is good for?
+
+### Zimbra Migrations
+Suppose you 
 
 ## TODO:
 

data/lib/zimbra_intercepting_proxy.rb

@@ -4,6 +4,7 @@ require 'em-proxy'
 require 'http/parser'
 require "addressable/uri"
 require 'logger'
+require 'xmlsimple'
 require "zimbra_intercepting_proxy/version"
 require "zimbra_intercepting_proxy/user"
 require "zimbra_intercepting_proxy/config"

data/lib/zimbra_intercepting_proxy/request.rb

@@ -4,16 +4,26 @@ module ZimbraInterceptingProxy
     
     attr_accessor :body, :headers, :parser
     
-    def initialize(connection, parser)
+    def initialize(connection, parser = nil)
       @body = connection.body
       @headers = connection.headers
       @parser = parser
     end
     
     def auth_request?
+      default_auth_request? || zco_auth_request?
+    end
+    
+    # This is the post Auth request sent by Webmail, ActiveSync and POP and IMAP
+    def default_auth_request?
       @parser.http_method == "POST" && @parser.request_url == "/zimbra/" && @headers["Cookie"] = "ZM_TEST=true" && auth_request_params?
     end
     
+    def zco_auth_request?
+      @parser.http_method == "POST" && @parser.request_url == "/service/soap/AuthRequest" && @headers["User-Agent"].match(/Zimbra-ZCO/)
+    end
+    
+    
     def auth_request_params?
       uri = Addressable::URI.parse("http://localhost/?#{@body}")
       uri.query_values["loginOp"] == "login"
@@ -29,14 +39,21 @@ module ZimbraInterceptingProxy
     end
     
     def user_token
-      return auth_username if auth_request?
+      return auth_username if default_auth_request?
       return auth_zimbraId if route_request?
+      return auth_zco_username if zco_auth_request?
     end
     
     def auth_zimbraId
       headers["Auth-User"]
     end
     
+    def auth_zco_username
+      # Hold on, we have to dig deeper
+      xml = XmlSimple.xml_in @body
+      xml["Body"].first["AuthRequest"].first["account"].first["content"]
+    end
+    
     def auth_username
       uri = Addressable::URI.parse("http://localhost/?#{@body}")
       uri.query_values["username"]

data/lib/zimbra_intercepting_proxy/server.rb

@@ -11,7 +11,7 @@ module ZimbraInterceptingProxy
 
       Proxy.start(:host => host, :port => port) do |conn|
         
-        debug.logger "Starting server on #{host}:#{port}"
+        debug.logger "Starting server on #{host}:#{port} - V. #{ZimbraInterceptingProxy::VERSION}"
         
         @backend = {host: ZimbraInterceptingProxy::Config.old_backend, port: 80}
         connection = ZimbraInterceptingProxy::Connection.new

data/lib/zimbra_intercepting_proxy/version.rb

@@ -1,3 +1,3 @@
 module ZimbraInterceptingProxy
-  VERSION = "0.0.4.1"
+  VERSION = "0.0.4.2"
 end

data/test/fixtures/zco_soap.xml

@@ -0,0 +1 @@
+<soap:Envelope xmlns:soap="http://www.w3.org/2003/05/soap-envelope"><soap:Header><context xmlns="urn:zimbra"><userAgent name="ZimbraConnectorForOutlook" version="8.5.1.1259"/><nonotify/><noqualify/></context></soap:Header><soap:Body><AuthRequest xmlns="urn:zimbraAccount"><account by="name">watson@example.com</account><password>watson</password><virtualHost>200.91.20.186</virtualHost></AuthRequest></soap:Body></soap:Envelope>

data/test/test_helper.rb

@@ -1,4 +1,5 @@
 require "zimbra_intercepting_proxy"
+require 'ostruct'
 
 require 'minitest/autorun'
 require 'minitest/reporters' # requires the gem

data/test/test_request.rb

@@ -3,18 +3,37 @@ require 'test_helper'
 class Request < Minitest::Test
   
   def setup
+    @done = false
     @auth_request = IO.read("./test/fixtures/auth_80.txt")
     @route_request = IO.read("./test/fixtures/route_7072.txt")
+    @soap_auth_request = IO.read("./test/fixtures/zco_soap.xml")
+    @connection = OpenStruct.new
+    @parser = OpenStruct.new
   end
   
-  # def test_should_return_user_token_from_auth_request
-  #   request = ZimbraInterceptingProxy::Request.new @auth_request
-  #   assert_equal("pbruna", request.user_token)
-  # end
-  #
-  # def test_should_return_user_token_from_route_request
-  #   request = ZimbraInterceptingProxy::Request.new @route_request
-  #   assert_equal("251b1902-2250-4477-bdd1-8a101f7e7e4e", request.user_token)
-  # end
-  #
+  def test_should_return_user_token_from_auth_request
+    @parser.http_method = "POST"
+    @parser.request_url = "/zimbra/"
+    @connection.headers = {"Cookie" => "ZM_TEST=true"}
+    @connection.body = "loginOp=login&username=pbruna&password=5693537374&client=preferred"
+    request = ZimbraInterceptingProxy::Request.new @connection, @parser
+    assert_equal("pbruna", request.user_token)
+  end
+
+  def test_should_return_user_token_from_route_request
+    @parser.request_url = ZimbraInterceptingProxy::Config::ROUTE_URL
+    @connection.headers = {"Auth-User" => "251b1902-2250-4477-bdd1-8a101f7e7e4e"}
+    request = ZimbraInterceptingProxy::Request.new @connection, @parser
+    assert_equal("251b1902-2250-4477-bdd1-8a101f7e7e4e", request.user_token)
+  end
+
+  def test_should_get_username_from_zco_auth_request
+    @parser.http_method = "POST"
+    @parser.request_url = "/service/soap/AuthRequest"
+    @connection.headers = {"User-Agent" => "Zimbra-ZCO"}
+    @connection.body = @soap_auth_request
+    request = ZimbraInterceptingProxy::Request.new @connection, @parser
+    assert_equal("watson@example.com", request.user_token)
+  end
+
 end

data/zimbra_intercepting_proxy.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["pbruna@itlinux.cl"]
   spec.summary       = "A HTTP intercepting Proxy for the Zimbra Proxy"
   spec.description   = spec.summary
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/pbruna/zimbra_intercepting_proxy"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'uuid'
   spec.add_dependency 'http_parser.rb'
   spec.add_dependency 'addressable'
+  spec.add_dependency 'xml-simple'
 
 
   spec.add_development_dependency "bundler", "~> 1.6"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zimbra_intercepting_proxy
 version: !ruby/object:Gem::Version
-  version: 0.0.4.1
+  version: 0.0.4.2
 platform: ruby
 authors:
 - Patricio Bruna
@@ -14,112 +14,126 @@ dependencies:
   name: em-proxy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: xml-simple
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A HTTP intercepting Proxy for the Zimbra Proxy
@@ -130,7 +144,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -148,12 +162,13 @@ files:
 - test/fixtures/auth_80.txt
 - test/fixtures/route_7072.txt
 - test/fixtures/users.yml
+- test/fixtures/zco_soap.xml
 - test/test_backend.rb
 - test/test_helper.rb
 - test/test_request.rb
 - test/test_user.rb
 - zimbra_intercepting_proxy.gemspec
-homepage: ''
+homepage: https://github.com/pbruna/zimbra_intercepting_proxy
 licenses:
 - MIT
 metadata: {}
@@ -163,17 +178,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.0.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A HTTP intercepting Proxy for the Zimbra Proxy
@@ -181,6 +196,7 @@ test_files:
 - test/fixtures/auth_80.txt
 - test/fixtures/route_7072.txt
 - test/fixtures/users.yml
+- test/fixtures/zco_soap.xml
 - test/test_backend.rb
 - test/test_helper.rb
 - test/test_request.rb