Changeset 287

Timestamp:

12/05/16 19:04:28 (8 years ago)

Author:

atzm

Message:

• add --noorigin option for sw

File:

• etherws/trunk/etherws.py (modified) (6 diffs)

etherws/trunk/etherws.py

@@ -416 +416 @@
     IFOP_ALLOWED = False
 
-    def __init__(self, app, req, switch, htpasswd, logger, debug):
+    def __init__(self, app, req, switch, htpasswd, noorigin, logger, debug):
         super(ServerHandler, self).__init__(app, req)
         self._switch = switch
         self._htpasswd = htpasswd
+        self._noorigin = noorigin
         self._logger = logger
         self._debug = debug
@@ -444 +445 @@
         self._switch.unregister_port(self)
         self._logger.info('disconnected: %s', self.request.remote_ip)
+
+    def check_origin(self, origin):
+        if self._noorigin:
+            return True
+        return super(ServerHandler, self).check_origin(origin)
 
 
@@ -728 +734 @@
         if not isinstance(cred, dict):
             return {}
-        if 'user' not in cred:
+        if cred.get('user') is None:
             return {}
-        if 'passwd' not in cred:
+        if cred.get('passwd') is None:
             return {}
 
@@ -1030 +1036 @@
                 'switch':   switch,
                 'htpasswd': args.htpasswd,
+                'noorigin': args.noorigin,
                 'logger':   logger,
                 'debug':    args.debug,
@@ -1048 +1055 @@
             'switch':   switch,
             'htpasswd': args.htpasswd,
+            'noorigin': args.noorigin,
             'logger':   logger,
             'debug':    args.debug,
@@ -1264 +1272 @@
                            help='path to SSL certificate for control API')
 
+    parser_sw.add_argument('--noorigin', action='store_true', default=False,
+                           help='do not check origin header')
+
     # - ctl
     parser_ctl = subcommand.add_parser('ctl',