Fix login=False when secure dropping in root

This commit is contained in:
Florian Mounier
2016-05-11 12:02:25 +02:00
parent ec25edb657
commit 7ebb122221
5 changed files with 16 additions and 17 deletions

View File

@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
__version__ = '2.0.1'
__version__ = '2.0.2'
import os

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -191,8 +191,7 @@ class Terminal(object):
# User has been auth with ssl or is the same user as server
# or login is explicitly turned off
if (
not tornado.options.options.unsecure and
tornado.options.options.login and not (
not tornado.options.options.unsecure and not (
self.socket.local and
self.caller == self.callee and
server == self.callee

View File

@@ -1,6 +1,6 @@
{
"name": "butterfly",
"version": "2.0.1",
"version": "2.0.2",
"description": "A sleek web based terminal emulator",
"repository": {
"type": "git",
@@ -13,13 +13,13 @@
},
"homepage": "https://github.com/paradoxxxzero/butterfly",
"devDependencies": {
"coffeelint": "^1.12.1",
"grunt": "^0.4.5",
"grunt-coffeelint": "0.0.13",
"grunt-contrib-coffee": "^0.13.0",
"grunt-contrib-cssmin": "^0.14.0",
"grunt-contrib-uglify": "^0.9.2",
"grunt-contrib-watch": "^0.6.1",
"grunt-sass": "^1.1.0-beta"
"coffeelint": "^1.15.7",
"grunt": "^1.0.1",
"grunt-coffeelint": "0.0.15",
"grunt-contrib-coffee": "^1.0.0",
"grunt-contrib-cssmin": "^1.0.1",
"grunt-contrib-uglify": "^1.0.1",
"grunt-contrib-watch": "^1.0.0",
"grunt-sass": "^1.2.0"
}
}