Merge pull request #190 from jumpserver/dev

Dev
2016-04-01 17:24:45 +08:00 · 2016-04-01 17:24:45 +08:00 · cd80fbcdbb
parent f65290ef38 5814b833ed
commit cd80fbcdbb
1 changed files with 3 additions and 1 deletions
--- a/run_server.py
+++ b/run_server.py
@ -233,6 +233,8 @@ class ExecHandler(tornado.websocket.WebSocketHandler):
    def open(self):
        logger.debug('Websocket: Open exec request')
        role_name = self.get_argument('role', 'sb')
+        self.remote_ip = self.request.headers.get("X-Real-IP")
+        if not self.remote_ip:
            self.remote_ip = self.request.remote_ip
        logger.debug('Web执行命令: 请求系统用户 %s' % role_name)
        self.role = get_object(PermRole, name=role_name)