[Gnash-commit] gnash ChangeLog server/URLAccessManager.cpp ser...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/04/04 07:10:19

Modified files:
        .              : ChangeLog 
        server         : URLAccessManager.cpp URLAccessManager.h 
        server/asobj   : xmlsocket.cpp 

Log message:
                * server/URLAccessManager.{cpp,h}: add allowHost interface.
                * server/asobj/xmlsocket.cpp (connect): check host security.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2771&r2=1.2772
http://cvs.savannah.gnu.org/viewcvs/gnash/server/URLAccessManager.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/URLAccessManager.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlsocket.cpp?cvsroot=gnash&r1=1.17&r2=1.18

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2771
retrieving revision 1.2772
diff -u -b -r1.2771 -r1.2772
--- ChangeLog   4 Apr 2007 07:00:02 -0000       1.2771
+++ ChangeLog   4 Apr 2007 07:10:19 -0000       1.2772
@@ -1,4 +1,9 @@
-2007-04-02 Zou Lunkai <address@hidden>
+2007-04-04 Sandro Santilli <address@hidden>
+
+       * server/URLAccessManager.{cpp,h}: add allowHost interface.
+       * server/asobj/xmlsocket.cpp (connect): check host security.
+
+2007-04-03 Zou Lunkai <address@hidden>
 
        * server/sprite_instance.cpp
        first attempt to deprecate reverse execution of frame tags

Index: server/URLAccessManager.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/URLAccessManager.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/URLAccessManager.cpp 20 Nov 2006 13:18:58 -0000      1.12
+++ server/URLAccessManager.cpp 4 Apr 2007 07:10:19 -0000       1.13
@@ -268,6 +268,21 @@
 }
 
 bool
+allowHost(const std::string& host, short port)
+{
+       return allowHost(host);
+}
+
+bool
+allowHost(const std::string& host)
+{
+       if (host.size() == 0) {
+               return true;
+       }
+       return host_check(host);
+}
+
+bool
 allow(const URL& url)
 {
        // We might reintroduce use of an AccessPolicy cache

Index: server/URLAccessManager.h
===================================================================
RCS file: /sources/gnash/gnash/server/URLAccessManager.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/URLAccessManager.h   29 Oct 2006 18:34:11 -0000      1.2
+++ server/URLAccessManager.h   4 Apr 2007 07:10:19 -0000       1.3
@@ -20,6 +20,8 @@
 #ifndef _GNASH_URLACCESSMANAGER_H
 #define _GNASH_URLACCESSMANAGER_H
 
+#include <string>
+
 // Forward declarations
 namespace gnash {
        class URL;
@@ -37,6 +39,10 @@
 ///
 bool allow(const URL& url);
 
+bool allowHost(const std::string& str);
+
+bool allowHost(const std::string& str, short port);
+
 } // AccessManager
 
 } // namespace gnash

Index: server/asobj/xmlsocket.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlsocket.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/asobj/xmlsocket.cpp  3 Apr 2007 16:17:45 -0000       1.17
+++ server/asobj/xmlsocket.cpp  4 Apr 2007 07:10:19 -0000       1.18
@@ -27,6 +27,7 @@
 #include "sprite_instance.h"
 #include "VM.h"
 #include "builtin_function.h" // for setting timer, should likely avoid that..
+#include "URLAccessManager.h"
 
 #include "log.h"
 
@@ -126,6 +127,13 @@
 XMLSocket::connect(const char *host, short port)
 {
     GNASH_REPORT_FUNCTION;
+
+    if ( ! URLAccessManager::allowHost(host, port) )
+    {
+           return false;
+    }
+           
+
     bool success = createClient(host, port);
 
     assert( success || ! connected() );