Wiki2Go 1.16.1 → 1.17.0

data/lib/Web2Go/CGIRequest.rb

@@ -1,5 +1,11 @@
 require 'cgi'
 
+class CGI
+  def my_env
+    env_table
+  end
+end
+
 module Web2Go
 
   class CGIFile
@@ -17,25 +23,47 @@ module Web2Go
 
   class CGIRequest
 
-    attr_reader :server_variable
     attr_reader :params
+    attr_reader :server_variable
 
     def initialize(cgi)
       @cgi = cgi
-      @server_variable = ENV
+      @server_variable = cgi.my_env
       @params = @cgi.params
+      @user = nil
+    end
+
+    def script_name
+      @cgi.script_name
     end
 
     def path
-      @server_variable['PATH_INFO']
+      @cgi.path_info
     end
 
     def host
-      @server_variable['SERVER_NAME']
+      if @server_variable.has_key?('HTTP_X_FORWARDED_HOST') then
+        host = @server_variable['HTTP_X_FORWARDED_HOST']
+      else
+        host = @cgi.server_name
+      end
+      if host =~ /^([^:]*):/ then
+        host = $1
+      end
+      host 
     end
 
     def port
-      @server_variable['SERVER_PORT']
+      if @server_variable.has_key?('HTTP_X_FORWARDED_HOST') then
+        host = @server_variable['HTTP_X_FORWARDED_HOST']
+        if host =~ /:(\d+)/ then
+          $1
+        else
+          '80' 
+        end
+      else
+        @cgi.server_port
+      end
     end
 
     def user
@@ -43,8 +71,12 @@ module Web2Go
       @user
     end
 
+    def query_string
+      @cgi.query_string
+    end
+
     def authenticated
-      @server_variable.has_key?("AUTH_TYPE")
+      !@cgi.auth_type.nil? && !@cgi.auth_type.empty?
     end
 
     def parameter(name,default_value=nil)
@@ -79,9 +111,9 @@ module Web2Go
     private
 
     def find_user
-      user = @server_variable['REMOTE_USER']
+      user = @cgi.remote_user
       if user.nil? or user.empty? then
-        user = @server_variable['REMOTE_ADDR']
+        user = @cgi.remote_addr
         begin
           addr = Resolv.getname(user)
           if !addr.nil? and !addr.empty? then

data/lib/Web2Go/MockRequest.rb

@@ -24,23 +24,27 @@ module Web2Go
   class MockRequest
 
     #Request interface    
-    attr_reader   :server_variable
     attr_reader   :params
     attr_accessor :user
     attr_accessor :authenticated
     attr_accessor :cookies
+    attr_reader   :server_variable
 
     def initialize(url = 'http://localhost/',env=ENV)
       @server_variable = get_server_variables(url)
       @server_variable.update( env)
 
-      @params = CGI::parse(server_variable['QUERY_STRING'])
+      @params = CGI::parse(@server_variable['QUERY_STRING'])
       @user = env['REMOTE_USER'] || env['USER'] || env['USERNAME']
       @authenticated = env.has_key?('AUTH_TYPE')
       @uploaded_files = {}
       @cookies = {} 
     end
 
+    def script_name
+      @server_variable['SCRIPT_NAME']
+    end
+
     def path
       @server_variable['PATH_INFO']
     end
@@ -53,6 +57,11 @@ module Web2Go
       @server_variable['SERVER_PORT']
     end
 
+    def query_string
+      @server_variable['QUERY_STRING']
+    end
+
+
     def parameter(name,default_value=nil)
       value = @params[name]
       if value.nil? then

data/lib/Web2Go/WebrickRequest.rb

@@ -32,6 +32,10 @@ module Web2Go
       @params = parse_parameters
     end
 
+    def script_name
+      @server_variable['SCRIPT_NAME']
+    end
+    
     def path
       @server_variable['PATH_INFO']
     end

data/lib/Wiki2Go/DotGraphics.rb

@@ -69,7 +69,7 @@ module Wiki2Go
     def rewrite_url(config,web,formatter,url)
       if url =~ /:\/\// then
         if config.redirect_url?(web,url) then
-          url = web.base_url + formatter.redirect_url(url)
+          url = web.base_url.chop + formatter.redirect_url(url)
         end
       else
         url = formatter.absolute_url_of_topic(url)