spiderfw 0.5.13 → 0.5.14

data/CHANGELOG

@@ -1,3 +1,14 @@
+= 0.5.14
+== 24 November, 2010
+* App management, setup wizard, configuration editor
+* Assets compressing
+* IdentityMapper, UnitOfWork and versioning
+* Role Based Access Control
+* Messenger backends
+* HtmlArea
+* Master and Servant apps
+* Many bugfixes and new methods
+
 = 0.5.13
 == 17 June, 2010
 * Changed gem dipendency from json to json_pure

data/Rakefile

@@ -15,9 +15,9 @@ desc "Update pot/po files. To update a single app, call rake updatepo[app_relati
 task :updatepo, [:app] do |t, args|
     require 'spiderfw'
     require 'spiderfw/i18n/shtml_parser'
+    require 'spiderfw/i18n/javascript_parser'
     require 'gettext/tools'
-    require 'ruby-debug'
-    GetText.update_pofiles("spider", Dir.glob("{lib,bin,views}/**/*.{rb,rhtml,shtml}"), "Spider #{Spider::VERSION}") if !args[:app] || args[:app] == 'spider'
+    GetText.update_pofiles("spider", Dir.glob("{lib,bin,views,public}/**/*.{rb,rhtml,shtml,js}"), "Spider #{Spider::VERSION}") if !args[:app] || args[:app] == 'spider'
     apps = Spider.find_all_apps
     apps.each do |path|
         next if args[:app] && !check_app_path(path, args[:app])
@@ -27,7 +27,10 @@ task :updatepo, [:app] do |t, args|
         next unless File.directory?(mod.path+'/po')
         next if args[:app] && !check_app_path(mod.path, args[:app])
         Dir.chdir(mod.path)
-        GetText.update_pofiles(mod.short_name, Dir.glob("{lib,bin,controllers,models,views,widgets}/**/*.{rb,rhtml,shtml}"), "#{mod.name} #{mod.version}")
+        mod.gettext_parsers.each do |p|
+            require p
+        end
+        GetText.update_pofiles(mod.short_name, Dir.glob("{#{mod.gettext_dirs.join(',')}}/**/*.{#{mod.gettext_extensions.join(',')}}"), "#{mod.name} #{mod.version}")
         print "\n"
     end
 
@@ -43,7 +46,7 @@ task :makemo, [:app] do |t, args|
         next if args[:app] && !check_app_path(path, args[:app])
         if File.directory?(path+'/po')
             Dir.chdir(path)
-            GetText.create_mofiles(:verbose => true, :po_root => './po', :mo_root => $SPIDER_PATH+'/data/locale')
+            GetText.create_mofiles(:verbose => true, :po_root => './po', :mo_root => "#{path}/data/locale")
         end
     end
 end

data/VERSION

@@ -1 +1 @@
-0.5.13
+0.5.14

data/apps/admin/_init.rb

@@ -0,0 +1,9 @@
+module Spider
+    module Admin
+        @route_url = 'admin'
+        include Spider::App
+        @controller = :AdminController
+    end
+end
+
+require 'apps/admin/controllers/admin_controller'

data/apps/admin/controllers/admin_controller.rb

@@ -0,0 +1,12 @@
+module Spider; module Admin
+    
+    class AdminController < Spider::PageController
+        
+        __.html
+        def index
+            $out << 'hello'
+        end
+        
+    end
+    
+end; end

data/apps/admin/widgets/dashboard_widget/dashboard_widget.rb

@@ -0,0 +1,8 @@
+module Spider; module Admin
+    
+    class DashboardWidget < Spider::Widget
+        
+        
+    end
+    
+end; end

data/apps/app_server/app_server.rb

@@ -19,9 +19,19 @@ module Spider
             self.paths.each do |path|
                 apps += scan_path(path)
             end
+            @apps_by_id = {}
+            apps.each do |app|
+                @apps_by_id[app.spec.id] = app
+                app.app_server(Spider.conf.get('app_server.url'))
+            end
             apps
         end
         
+        def self.apps_by_id
+            self.apps
+            @apps_by_id
+        end
+        
         def self.scan_path(path)
             apps = []
             git_repos = search_git(path)
@@ -52,7 +62,7 @@ module Spider
         end
         
         def self.paths
-            Spider.conf.get('app_server.search_paths')
+            Spider.conf.get('app_server.search_paths') || []
         end
         
     end

data/apps/app_server/config/options.rb

@@ -1,2 +1,6 @@
+Spider.config_option 'app_server.url', _("Url of the app server"), :default => 'http://www.soluzionipa.it/euroservizi/spider/app_server'
 Spider.config_option 'app_server.search_paths', _("Paths to search for apps"), :type => Array
+Spider.config_option 'app_server.git_ssh', _("Name of the ssh server")
+Spider.config_option 'app_server.git_http', _("Http git prefix for each git path"), :type => Hash
+
 

data/apps/app_server/controllers/app_server_controller.rb

@@ -1,20 +1,58 @@
+require 'tempfile'
+
 module Spider; module AppServer
-    
+
     class AppServerController < Spider::PageController
-        
+
         layout 'app_server'
-        
+
         __.html :template => 'app_list'
         __.json :call => :list_json
-        def list
+        def list(name=nil)
             @scene.apps = AppServer.apps
         end
-        
-        def list_json
-            $out << AppServer.apps.to_json
+
+        __.text
+        def list_json(names=nil)
+            if names
+                apps = names.split('+')
+                $out << (apps.map{ |name| AppServer.apps_by_id[name] }).to_json
+            else
+                $out << AppServer.apps.to_json
+            end
+        end
+
+        __.action
+        def pack(name=nil)
+            app = AppServer.apps_by_id[name]
+            raise NotFound.new("App #{name}") unless app
+            tmp = Tempfile.new("spider-app-archive")
+            if app.is_a?(GitApp)
+                repo = app.repo
+                repo.archive_to_file('master', nil, tmp.path, nil, 'cat') 
+            else
+                # TODO
+            end
+            output_static(tmp.path)
+            tmp.close
         end
         
+        __.json
+        def deps(names)
+            names = names.split('+')
+            new_apps = names
+            specs = {}
+            while !new_apps.empty? && curr = new_apps.pop
+                raise NotFound.new("App #{curr}") unless AppServer.apps_by_id[curr]
+                spec = AppServer.apps_by_id[curr].spec 
+                specs[curr] = spec
+                new_apps += spec.depends.reject{ |app| specs[app] }
+                new_apps += spec.depends_optional.reject{ |app| specs[app] } unless @request.params['no_optional']
+            end
+            $out << specs.values.to_json
+        end
+
     end
-    
-    
+
+
 end; end

data/apps/app_server/lib/app.rb

@@ -1,10 +1,12 @@
 module Spider; module AppServer
     
     class App
+        attr_reader :path
         attr_accessor :spec
         attr_reader :last_modified
         
-        def initialize
+        def initialize(path)
+            @path = path
         end
         
         def method_missing(name, *args)

data/apps/app_server/lib/git_app.rb

@@ -3,17 +3,33 @@ require 'grit'
 module Spider; module AppServer
     
     class GitApp < App
+        attr_reader :repo
         
         def initialize(path)
+            super
             repo = Grit::Repo.new(path)
             spec = nil
             repo.tree.blobs.each do |blob|
                 next unless blob.basename =~ /\.appspec$/
                 spec = blob.data
                 @spec = Spider::App::AppSpec.eval(spec)
+                if repo_base = Spider.conf.get('app_server.git_repo_base')
+                    unless @spec.git_repo
+                        @spec.git_repo(repo_base+'/'+@spec.id)
+                    end
+                end
+                if repo_base_rw = Spider.conf.get('app_server.git_repo_rw_base')
+                    unless @spec.git_repo_rw
+                        @spec.git_repo_rw(repo_base_rw+'/'+@spec.id)
+                    end
+                end
                 @last_modified = repo.commits.first.authored_date # FIXME
                 break
             end
+            @repo = repo
+        end
+        
+        def package
             
         end
         

data/apps/app_server/views/app_list.shtml

@@ -1,7 +1,7 @@
 <ul>
     <li sp:each="@apps |app|">
         <h5>{ app.name } ({ app.version })</h5>
-        <div class="description">
+        <div class="description" sp:if="!app.description.blank?">
             { app.description }
         </div>
     </li>

data/apps/cas_server/config/options.rb

@@ -5,5 +5,9 @@ module Spider
     config_option 'cas.service_ticket_expiry', :type => Fixnum, :default => 5*60
     config_option 'cas.proxy_granting_ticket_expiry', :type => Fixnum, :default => 48*60*60
     config_option 'cas.ticket_granting_ticket_expiry', :type => Fixnum, :default => 48*60*60
+    config_option 'cas.saml1_1_compatible', :type => Spider::DataTypes::Bool, :default => false
+    config_option 'cas.saml_compliant_tickets', :type => String, :choices => [false, '1', '2', '4'], :default => lambda{
+        Spider.conf.get('cas.saml1_1_compatible') ? '1' : false
+    }
     
 end

data/apps/cas_server/controllers/mixins/cas_login_mixin.rb

@@ -1,5 +1,7 @@
 require 'apps/cas_server/lib/cas'
 require 'builder'
+require 'rexml/document'
+require "uuidtools"
 
 module Spider; module CASServer
 
@@ -7,14 +9,31 @@ module Spider; module CASServer
         include Annotations
         include Spider::CASServer::CAS
         
+        CAS_NS                  = 'http://www.yale.edu/tp/cas'
+        SOAP_ENVELOPE_NS        = 'http://schemas.xmlsoap.org/soap/envelope/'
+        SAML1_NS                = 'urn:oasis:names:tc:SAML:1.0:protocol'
+        SAML1_ASSERTION_NS      = 'urn:oasis:names:tc:SAML:1.0:assertion'
+        XML_SCHEMA_NS           = 'http://www.w3.org/2001/XMLSchema'
+        XML_SCHEMA_INSTANCE_NS  = 'http://www.w3.org/2001/XMLSchema-instance'
+        SAML1_ARTIFACT          = 'urn:oasis:names:tc:SAML:1.0:cm:artifact'
+        CAS_OPENWEB_NS          = 'http://mapweb.it/openweb/cas'
+        SAML1_PASSWORD          = 'urn:oasis:names:tc:SAML:1.0:am:password'
+
         def self.included(controller)
             controller.route 'proxyValidate', :proxy_validate
             controller.route 'serviceValidate', :service_validate
+            controller.route 'samlValidate', :saml_validate
             #controller.route 'login', :index
         end
 
         def before(action='', *arguments)
-            @service = clean_service_url(@request.params['service'])
+            is_saml = false
+            if @request.params['service']
+                @service = clean_service_url(@request.params['service'])
+            elsif Spider.conf.get('cas.saml1_1_compatible') && @request.params['TARGET']
+                @service = clean_service_url(@request.params['TARGET'])
+                is_saml = true
+            end
             @renew = @request.params['renew']
             @gateway = @request.params['gateway'] == 'true' || @request.params['gateway'] == '1'
             if tgc = @request.cookies['tgc']
@@ -36,7 +55,7 @@ module Spider; module CASServer
                 if @service #&& cas_service_allowed?(@service)
                     if !@renew && tgt && !tgt_error
                         st = generate_service_ticket(@service, tgt.username, tgt)
-                        service_with_ticket = service_uri_with_ticket(@service, st)
+                        service_with_ticket = service_uri_with_ticket(@service, st, is_saml)
                         $LOG.info("User '#{tgt.username}' authenticated based on ticket granting cookie. Redirecting to service '#{@service}'.")
                         return redirect(service_with_ticket, 303) # response code 303 means "See Other" (see Appendix B in CAS Protocol spec)
                     elsif @gateway
@@ -60,22 +79,22 @@ module Spider; module CASServer
             @scene.cas_service = @service
             super
         end
-        
+
         def response_xml
             xm = Builder::XmlMarkup.new(:target => $out, :indent => 2)
             #xm.instruct!
             return xm
         end
-        
+
         def cas_user_attributes(user)
             return user.user_attributes(:cas) if user.respond_to?(:user_attributes)
             return {}
         end
-        
+
         def cas_service_allowed?(service, user)
             return true
         end
-        
+
         def authenticate
             if error = validate_login_ticket(@request.params['lt'])
                 @scene.message = error
@@ -90,7 +109,7 @@ module Spider; module CASServer
             cas_user_authenticated(user)
             return user
         end
-        
+
         def cas_user_authenticated(user)
             extra_attributes = cas_user_attributes(user)
             tgt = generate_ticket_granting_ticket(user.identifier, extra_attributes)
@@ -118,14 +137,15 @@ module Spider; module CASServer
                     service_with_ticket = service_uri_with_ticket(@service, @st)
 
                     $LOG.info("Redirecting authenticated user '#{user.identifier}' at '#{@st.client_hostname}' to service '#{@service}'")
-                    return redirect(service_with_ticket, 303) # response code 303 means "See Other" (see Appendix B in CAS Protocol spec)
+                    resp_code = Spider.conf.get('cas.saml1_1_compatible') ? 302 : 303
+                    return redirect(service_with_ticket, resp_code) # response code 303 means "See Other" (see Appendix B in CAS Protocol spec)
                 rescue URI::InvalidURIError
                     $LOG.error("The service '#{@service}' is not a valid URI!")
                     @message = {:type => 'mistake', :message => _("The target service your browser supplied appears to be invalid. Please contact your system administrator for help.")}
                 end
             end
         end
-        
+
         __.html
         def login
             @service = clean_service_url(@request.params['service'] || @request.params['destination'])
@@ -138,7 +158,7 @@ module Spider; module CASServer
             end 
             index
         end
-        
+
         __.html
         def logout
             @service = clean_service_url(@request.params['service'] || @request.params['destination'])
@@ -188,10 +208,8 @@ module Spider; module CASServer
             @scene.continue_url = @continue_url
             if (@gateway && @service)
                 redirect(@service, 303)
-            elsif (@continue_url)
-                render 'logout'
             else
-                render 'login'
+                super
             end
         end
 
@@ -213,6 +231,113 @@ module Spider; module CASServer
                 $out << "no\n\n"
             end
 
+        end
+        
+        __.xml
+        def saml_validate
+            @error = nil
+            @success = false
+            begin
+                req = @request.read_body
+                doc = REXML::Document.new req
+            rescue REXML::ParseException
+                raise CASSAMLError, "Could not parse XML"
+            end
+            client_hostname = @request.env['HTTP_X_FORWARDED_FOR'] || @request.env['REMOTE_HOST'] || @request.env['REMOTE_ADDR']
+            raise CASSAMLError, "SOAP Envelope not found" unless doc.root && doc.root.name == 'Envelope' && doc.root.namespace == SOAP_ENVELOPE_NS
+            @service = clean_service_url(@request.params['service'] || @request.params['TARGET'])
+            @service = nil if @service.blank?
+            ns = {'SOAP-ENV' => SOAP_ENVELOPE_NS, 'samlp' => SAML1_NS }
+            body = REXML::XPath.first(doc, "//SOAP-ENV:Body", ns)
+            raise CASSAMLError, "SOAP Body not found" unless body
+            request = REXML::XPath.first(body, "//samlp:Request", ns)
+            raise CASSAMLError, "SAML Request not found" unless request
+            unless request.attributes["MajorVersion"] == '1' && request.attributes['MinorVersion'] == '1'
+                raise CASSAMLError, "CAS requires SAML version 1.1" 
+            end
+            artifact = REXML::XPath.first(body, "//samlp:AssertionArtifact", ns)
+            raise CASSAMLError, "SAML AssertionArtifact not found" unless artifact
+            @ticket = artifact.text.strip
+            st, @error = validate_service_ticket(@service, @ticket, false, true)
+            @success = st && !@error
+            
+            raise CASSAMLError, "Error validating the service ticket: #{@error}" unless @success
+            
+            if @success
+                @username = st.username  
+                @extra_attributes = st.ticket_granting_ticket.extra_attributes || {}
+            end
+            now = Time.now
+            @response.headers['Content-Type'] = 'text/xml'
+            xm = Builder::XmlMarkup.new(:target => $out, :indent => 2)
+            xm.instruct!
+            xm.tag!("SOAP-ENV", :Envelope, 'xmlns:SOAP-ENV' => SOAP_ENVELOPE_NS) do
+                xm.tag!("SOAP-ENV", :Header)
+                xm.tag!("SOAP-ENV", :Body){
+                    xm.Response(
+                        'xmlns' => SAML1_NS,
+                        'xmlns:saml' => SAML1_ASSERTION_NS,
+                        'xmlns:samlp' => SAML1_NS,
+                        'xmlns:xsd' => XML_SCHEMA_NS,
+                        'xmlns:xsi' => XML_SCHEMA_INSTANCE_NS,
+                        'IssueInstant' => now.xmlschema,
+                        'MajorVersion' => '1',
+                        'MinorVersion' => '1',
+                        'Recipient' => client_hostname,
+                        'ResponseID' => '_'+UUIDTools::UUID.random_create.hexdigest
+                    ){
+                        xm.Status{
+                            xm.StatusCode('Value' => 'samlp:Success')
+                        }
+                        xm.Assertion(
+                            'xmlns' => SAML1_ASSERTION_NS,
+                            'AssertionID' => '_'+UUIDTools::UUID.random_create.hexdigest,
+                            'IssueInstant' => now.xmlschema,
+                            'Issuer' => @request.http_host,
+                            'MajorVersion' => '1',
+                            'MinorVersion' => '1'
+                        ){
+                            xm.Conditions('NotBefore' => now.xmlschema, 'NotOnOrAfter' => (now+Spider.conf.get('cas.service_ticket_expiry')).xmlschema){
+                                xm.AudienceRestrictionCondition{
+                                    xm.Audience client_hostname
+                                }
+                            }
+                            xm.AttributeStatement{
+                                xm.Subject{
+                                    xm.NameIdentifier @username.to_s
+                                }
+                                xm.SubjectConfirmation{
+                                    xm.ConfirmationMethod SAML1_ARTIFACT
+                                }
+                                @extra_attributes.each do |key, value|
+                                    xm.Attribute('AttributeName' => key.to_s, 'AttributeNamespace' => CAS_OPENWEB_NS){
+                                        if value.kind_of?(String) || value.kind_of?(Numeric)
+                                            xm.AttributeValue value
+                                        else
+                                            xm.AttributeValue{ xm.cdata!(value.to_yaml) }
+                                        end
+                                    }
+
+                                end
+                            }
+                            xm.AuthenticationStatement(
+                                'AuthenticationInstant' => now.xmlschema,
+                                'AuthenticationMethod' => SAML1_PASSWORD
+                            ){
+                                xm.Subject{
+                                    xm.NameIdentifier @username.to_s
+                                }
+                                xm.SubjectConfirmation{
+                                    xm.ConfirmationMethod SAML1_ARTIFACT
+                                }
+                            }
+                        }
+                        
+                    }
+                }
+            end
+            
+            
         end
 
         def service_validate
@@ -237,17 +362,17 @@ module Spider; module CASServer
             end
 
             @response.status = response_status_from_error(@error) if @error
-            
+
             xm = response_xml
-            xm.cas(:serviceResponse, 'xmlns:cas' => 'http://www.yale.edu/tp/cas') do
+            xm.cas(:serviceResponse, 'xmlns:cas' => CAS_NS, 'xmlns:ow' => CAS_OPENWEB_NS) do
                 if (@success)
                     xm.cas(:authenticationSuccess) do
                         xm.cas(:user, @username.to_s)
                         @extra_attributes.each do |key, value|
                             if value.kind_of?(String) || value.kind_of?(Numeric)
-                                xm.tag!(key.to_s, value)
+                                xm.tag!(:ow, key.to_s.to_sym, value)
                             else
-                                xm.tag!(key.to_s){ xm.cdata!(value.to_yaml) }
+                                xm.tag!(:ow, key.to_s.to_sym){ xm.cdata!(value.to_yaml) }
                             end
                         end
                         if (@pgtiou)
@@ -286,7 +411,7 @@ module Spider; module CASServer
                     pgt = generate_proxy_granting_ticket(@pgt_url, t)
                     @pgtiou = pgt.iou if pgt
                 end
-                
+
                 @extra_attributes = t.ticket_granting_ticket.extra_attributes || {}
             end
 
@@ -320,8 +445,8 @@ module Spider; module CASServer
                 end
             end
         end
-        
-        
+
+
         __.xml
         def proxy
 
@@ -333,11 +458,11 @@ module Spider; module CASServer
             @success = pgt && !@error
 
             if @success
-              @pt = generate_proxy_ticket(@target_service, pgt)
+                @pt = generate_proxy_ticket(@target_service, pgt)
             end
 
             @response.status = response_status_from_error(@error) if @error
-            
+
             xm = response_xml
             xm.cas(:serviceResponse, 'xmlns:cas' => 'http://www.yale.edu/tp/cas') do
                 if (@success)
@@ -349,18 +474,54 @@ module Spider; module CASServer
                 end
             end
         end
-        
+
         def response_status_from_error(error)
-          case error.code.to_s
-          when /^INVALID_/, 'BAD_PGT'
-            422
-          when 'INTERNAL_ERROR'
-            500
-          else
-            500
-          end
+            case error.code.to_s
+            when /^INVALID_/, 'BAD_PGT'
+                422
+            when 'INTERNAL_ERROR'
+                500
+            else
+                500
+            end
         end
+        
+        def try_rescue(exc)
+            if exc.is_a?(CASSAMLError)
+                @response.headers['Content-Type'] = 'text/xml'
+                now = Time.now
+                xm = Builder::XmlMarkup.new(:target => $out, :indent => 2)
+                xm.instruct!
+                xm.tag!("SOAP-ENV", :Envelope, 'xmlns:SOAP-ENV' => SOAP_ENVELOPE_NS) do
+                    xm.tag!("SOAP-ENV", :Header)
+                    xm.tag!("SOAP-ENV", :Body){
+                        xm.Response(
+                            'xmlns' => SAML1_NS,
+                            'xmlns:saml' => SAML1_ASSERTION_NS,
+                            'xmlns:samlp' => SAML1_NS,
+                            'xmlns:xsd' => XML_SCHEMA_NS,
+                            'xmlns:xsi' => XML_SCHEMA_INSTANCE_NS,
+                            'IssueInstant' => now.xmlschema,
+                            'MajorVersion' => '1',
+                            'MinorVersion' => '1',
+                            'Recipient' => @request.env['HTTP_REFERER'],
+                            'ResponseID' => '_'+UUIDTools::UUID.random_create.hexdigest
+                        ){
+                            xm.Status{
+                                xm.StatusCode('Value' => 'samlp:Failure')
+                                xm.StatusMessage(exc.message)
+                            }
+                        }
+                    }
+                end
+                done
+            end
+            super
+        end
+
+    end
 
+    class CASSAMLError < RuntimeError
     end
 
 end; end