make sure internal servlet attributes are retrieved on env['internal.attr'] (fixes #173)

Author: kares

src/main/ruby/rack/handler/servlet/default_env.rb

@@ -167,25 +167,32 @@ def load_header(env, key)
         def load_variable(env, key)
           return nil if @servlet_env.nil?
           case key
-          when 'CONTENT_TYPE'
-            content_type = @servlet_env.getContentType
-            env[key] = content_type if content_type
-          when 'CONTENT_LENGTH'
-            content_length = @servlet_env.getContentLength
-            env[key] = content_length.to_s if content_length >= 0
-          when 'PATH_INFO'       then env[key] = @servlet_env.getPathInfo
-          when 'QUERY_STRING'    then env[key] = @servlet_env.getQueryString || ''
-          when 'REMOTE_ADDR'     then env[key] = @servlet_env.getRemoteAddr || ''
-          when 'REMOTE_HOST'     then env[key] = @servlet_env.getRemoteHost || ''
-          when 'REMOTE_USER'     then env[key] = @servlet_env.getRemoteUser || ''
-          when 'REQUEST_METHOD'  then env[key] = @servlet_env.getMethod || 'GET'
-          when 'REQUEST_URI'     then env[key] = @servlet_env.getRequestURI
-          when 'SCRIPT_NAME'     then env[key] = @servlet_env.getScriptName
-          when 'SERVER_NAME'     then env[key] = @servlet_env.getServerName || ''
-          when 'SERVER_PORT'     then env[key] = @servlet_env.getServerPort.to_s
-          when 'SERVER_SOFTWARE' then env[key] = rack_context.getServerInfo
-          else
-            nil
+            when 'CONTENT_TYPE'
+              content_type = @servlet_env.getContentType
+              env[key] = content_type if content_type
+            when 'CONTENT_LENGTH'
+              content_length = @servlet_env.getContentLength
+              env[key] = content_length.to_s if content_length >= 0
+            when 'PATH_INFO'       then env[key] = @servlet_env.getPathInfo
+            when 'QUERY_STRING'    then env[key] = @servlet_env.getQueryString || ''
+            when 'REMOTE_ADDR'     then env[key] = @servlet_env.getRemoteAddr || ''
+            when 'REMOTE_HOST'     then env[key] = @servlet_env.getRemoteHost || ''
+            when 'REMOTE_USER'     then env[key] = @servlet_env.getRemoteUser || ''
+            when 'REQUEST_METHOD'  then env[key] = @servlet_env.getMethod || 'GET'
+            when 'REQUEST_URI'     then env[key] = @servlet_env.getRequestURI
+            when 'SCRIPT_NAME'     then env[key] = @servlet_env.getScriptName
+            when 'SERVER_NAME'     then env[key] = @servlet_env.getServerName || ''
+            when 'SERVER_PORT'     then env[key] = @servlet_env.getServerPort.to_s
+            when 'SERVER_SOFTWARE' then env[key] = rack_context.getServerInfo
+            else
+              # NOTE: even though we allowed for overrides and loaded all attributes
+              # up front (looping thru getAttributeNames) container "hidden" attribs
+              # might still get resolved e.g. 'org.apache.tomcat.sendfile.support'
+              if hidden_attr = @servlet_env.getAttribute(key)
+                env[key] = hidden_attr
+              else
+                nil
+              end
           end
         end
 

src/spec/ruby/rack/handler/servlet_spec.rb

@@ -1,11 +1,5 @@
-#--
-# Copyright (c) 2010-2012 Engine Yard, Inc.
-# Copyright (c) 2007-2009 Sun Microsystems, Inc.
-# This source code is available under the MIT license.
-# See the file LICENSE.txt for details.
-#++
-
-require File.expand_path('spec_helper', File.dirname(__FILE__) + '/../..')
+require File.expand_path('../../spec_helper', File.dirname(__FILE__))
+
 require 'rack/handler/servlet'
 require 'stringio'
 
@@ -341,6 +335,34 @@
       expect( env['jruby.rack.context'] ).to be @rack_context
     end
 
+    it "retrieves hidden attribute" do
+      servlet_request_class = Class.new(org.jruby.rack.mock.MockHttpServletRequest) do
+
+        def getAttributeNames
+          names = super.to_a.reject { |name| name.start_with?('org.apache') }
+          return java.util.Collections.enumeration(names)
+        end
+
+      end
+      servlet_request = servlet_request_class.new(servlet_context)
+      servlet_request.setAttribute('current_page', 'index.html'.to_java)
+      servlet_request.setAttribute('org.answer.internal', 4200.to_java)
+      servlet_request.setAttribute('org.apache.internal', true.to_java)
+      
+      servlet_env = org.jruby.rack.servlet.ServletRackEnvironment.new(
+        servlet_request, servlet_response, @rack_context
+      )
+
+      env = servlet.create_env servlet_env
+
+      expect( env.keys ).to include 'current_page'
+      expect( env.keys ).to include 'org.answer.internal'
+      expect( env.keys ).to_not include 'org.apache.internal'
+
+      expect( env['org.answer.internal'] ).to be 4200
+      expect( env['org.apache.internal'] ).to be true
+    end
+
   end
 
   shared_examples "(eager)rack-env" do