dango 0.2.2 → 0.2.3

data/lib/dango/server_framework.rb

@@ -101,7 +101,7 @@ class DangoServerFramework
     begin
       File.delete("tmp/pids/dango.pid")
     rescue 
-      puts "failed delete file. tmp/pids/dango.pid:#{$!.class}:#{$!.message}"
+#      puts "failed delete file. tmp/pids/dango.pid:#{$!.class}:#{$!.message}"
     end
     puts "shutdown"
     exit!
@@ -318,20 +318,34 @@ class DangoServerFramework
           is_flash_policy_file = true
         end
         
-        if is_flash_policy_file && @policy_file_request # Flashのポリシーファイルが来たら
-          logger.info "is_flash_policy_file #{sid} "
-          policy_data = <<EOF
+        if is_flash_policy_file # Flashのポリシーファイルが来たら
+          logger.info "is_flash_policy_file"
+          
+          if @policy_file_request # ポリシーファイルを返す設定なら
+            logger.info "is_flash_policy_file #{sid} #{@policy_file_request}"
+
+            allow_str = ""
+            @policy_file_allow_domain.each do |one_host|
+              allow_str += %Q|<allow-access-from domain="#{one_host}" to-ports="#{@network_port}" />|
+              allow_str += "\n"
+            end
+
+            policy_data = <<EOF
 <?xml version="1.0"?>
 <cross-domain-policy>
-<allow-access-from domain="#{@network_host}" to-ports="#{@network_port}" />
+#{allow_str}
 </cross-domain-policy>
 EOF
 
-          logger.debug policy_data
-          sock.write policy_data
-          sock.flush
+            logger.debug policy_data
+            sock.write policy_data
+            sock.flush
+            logger.info "policy file sent."
+          end
+          
+          # この部分はポリシーファイルを返す設定に関係なく実行する部分
           sleep 0.1
-          raise(DangoFrameworkFlashPolicyError, "policy file sent. disconnectiong...")
+          raise(DangoFrameworkFlashPolicyError, "requested policy file. disconnectiong...")
           
         elsif ret_objs == [] # 受信データがなければ
 #          logger.debug "ret_objs is empty. "
@@ -394,7 +408,7 @@ EOF
       end # loop
       
     rescue DangoFrameworkFlashPolicyError
-      logger.info "Flash policy file send. #{sid} "
+      logger.info "Flash policy file #{sid} "
       
     rescue DangoFrameworkMonitorSecurityError
       logger.warn "Monitor Security Error #{sid} "
@@ -466,7 +480,6 @@ EOF
     @log_shift_age                     = @config['server']['log_shift_age'] || DefaultLogShiftAge
     @gserver_log_file                  = @config['server']['gserver_log_file'] || DefaultGServerLogFile
     
-    @policy_file_request               = @config['server']['policy_file_request'] || true
     @send_receive_sleep_interval_sec   = @config['server']['send_receive_sleep_interval_sec'] || SendReceiveSleepIntervalSec
     @send_receive_timeout_default_sec  = @config['server']['send_receive_timeout_default_sec'] || SendReceiveTimeoutDefaultSec
 #    @send_timeout_sec                  = @config['server']['send_timeout_sec'] || SendTimeoutSec
@@ -475,6 +488,12 @@ EOF
     @heart_beat_receive_wait_sec       = @config['server']['heart_beat_receive_wait_sec'] || HeartBeatReceiveWaitSec
     @gc_interval_sec                   = @config['server']['gc_interval_sec'] || GCIntervalSec
     
+    @policy_file_request               = @config['server']['policy_file_request']
+    @policy_file_request               = true if @policy_file_request == nil
+    
+    @policy_file_allow_domain          = @config['server']['policy_file_allow_domain']
+    @policy_file_allow_domain          = [@network_host] if @policy_file_allow_domain.class != Array
+
     # ログレベルの設定
     log_level_hash = {
       "FATAL" => Logger::FATAL, 

data/lib/dango/version.rb

@@ -2,7 +2,7 @@ module Dango #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dango
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Keisuke Minami
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-26 00:00:00 +09:00
+date: 2008-05-01 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency