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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/11/20 13:18:58

Modified files:
        .              : ChangeLog 
        server         : URLAccessManager.cpp 

Log message:
                * server/URLAccessManager.cpp (host_check_blackwhite_lists):
                  if whitelist is non-empty and host is not listed there, forbid
                  access.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1672&r2=1.1673
http://cvs.savannah.gnu.org/viewcvs/gnash/server/URLAccessManager.cpp?cvsroot=gnash&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1672
retrieving revision 1.1673
diff -u -b -r1.1672 -r1.1673
--- ChangeLog   20 Nov 2006 12:43:09 -0000      1.1672
+++ ChangeLog   20 Nov 2006 13:18:58 -0000      1.1673
@@ -1,5 +1,8 @@
 2006-11-20 Sandro Santilli <address@hidden>
 
+       * server/URLAccessManager.cpp (host_check_blackwhite_lists):
+         if whitelist is non-empty and host is not listed there, forbid
+         access.
        * libbase/rc.cpp (dump): typo fixed
        * testsuite/actionscript.all/gen-index.sh: add more info
          in the versioned SWF index page.

Index: server/URLAccessManager.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/URLAccessManager.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/URLAccessManager.cpp 11 Nov 2006 10:26:33 -0000      1.11
+++ server/URLAccessManager.cpp 20 Nov 2006 13:18:58 -0000      1.12
@@ -163,6 +163,8 @@
        vector<string>::iterator it;
 
        vector<string> whitelist = rcfile.getWhiteList();
+       if ( whitelist.size() )
+       {
        // TODO: case-insensitive matching ? 
        it = find(whitelist.begin(), whitelist.end(), host);
        if ( it != whitelist.end() ) {
@@ -171,6 +173,14 @@
                return true;
        }
 
+               // if there is a whitelist, anything NOT listed is denied
+               log_security("Load from host %s forbidden "
+                       "(not in non-empty whitelist).",
+                       host.c_str());
+
+               return false;
+       }
+
        vector<string> blacklist = rcfile.getBlackList();
        // TODO: case-insensitive matching ? 
        it = find(blacklist.begin(), blacklist.end(), host);