From bb2fcd5b00e2a4033d4f0403b6010c0a1a72da95 Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Thu, 6 Oct 2016 20:25:04 -0500 Subject: [PATCH 01/15] Update flask, flask-{login,principal,babel,assets} versions to the latest, flask.ext. => flask_ --- setup.py | 10 ++--- src/octoprint/plugin/types.py | 2 +- .../plugins/announcements/__init__.py | 2 +- src/octoprint/plugins/corewizard/__init__.py | 2 +- .../plugins/pluginmanager/__init__.py | 2 +- .../plugins/softwareupdate/__init__.py | 4 +- src/octoprint/server/__init__.py | 8 ++-- src/octoprint/server/api/__init__.py | 4 +- src/octoprint/server/api/languages.py | 2 +- src/octoprint/server/api/system.py | 2 +- src/octoprint/server/api/users.py | 2 +- src/octoprint/server/util/flask.py | 42 +++++++++---------- src/octoprint/users.py | 4 +- 13 files changed, 43 insertions(+), 43 deletions(-) diff --git a/setup.py b/setup.py index 49b2cb9c..eaa06d68 100644 --- a/setup.py +++ b/setup.py @@ -14,15 +14,15 @@ import octoprint_setuptools # Requirements for our application INSTALL_REQUIRES = [ - "flask>=0.9,<0.11", + "flask>=0.11,<0.12", "werkzeug>=0.8.3,<0.9", "tornado>=4.0.2,<4.1", "sockjs-tornado>=1.0.2,<1.1", "PyYAML>=3.10,<3.11", - "Flask-Login>=0.2.2,<0.3", - "Flask-Principal>=0.3.5,<0.4", - "Flask-Babel>=0.9,<0.10", - "Flask-Assets>=0.10,<0.11", + "Flask-Login>=0.3,<0.4", + "Flask-Principal>=0.4,<0.5", + "Flask-Babel>=0.11,<0.12", + "Flask-Assets>=0.12,<0.13", "markdown>=2.6.4,<2.7", "pyserial>=2.7,<2.8", "netaddr>=0.7.17,<0.8", diff --git a/src/octoprint/plugin/types.py b/src/octoprint/plugin/types.py index 2bcc9f3b..f9659e7d 100644 --- a/src/octoprint/plugin/types.py +++ b/src/octoprint/plugin/types.py @@ -1373,7 +1373,7 @@ class SettingsPlugin(OctoPrintPlugin): :return: the current settings of the plugin, as a dictionary """ - from flask.ext.login import current_user + from flask_login import current_user data = self._settings.get_all_data() if self.config_version_key in data: diff --git a/src/octoprint/plugins/announcements/__init__.py b/src/octoprint/plugins/announcements/__init__.py index 890e8291..3cc03c10 100644 --- a/src/octoprint/plugins/announcements/__init__.py +++ b/src/octoprint/plugins/announcements/__init__.py @@ -20,7 +20,7 @@ import flask from octoprint.server import admin_permission from octoprint.server.util.flask import restricted_access, with_revalidation_checking, check_etag -from flask.ext.babel import gettext +from flask_babel import gettext class AnnouncementPlugin(octoprint.plugin.AssetPlugin, octoprint.plugin.SettingsPlugin, diff --git a/src/octoprint/plugins/corewizard/__init__.py b/src/octoprint/plugins/corewizard/__init__.py index 1a6b4e03..41dc4a13 100644 --- a/src/octoprint/plugins/corewizard/__init__.py +++ b/src/octoprint/plugins/corewizard/__init__.py @@ -9,7 +9,7 @@ __copyright__ = "Copyright (C) 2015 The OctoPrint Project - Released under terms import octoprint.plugin -from flask.ext.babel import gettext +from flask_babel import gettext class CoreWizardPlugin(octoprint.plugin.AssetPlugin, diff --git a/src/octoprint/plugins/pluginmanager/__init__.py b/src/octoprint/plugins/pluginmanager/__init__.py index 51f002a8..c18ea2db 100644 --- a/src/octoprint/plugins/pluginmanager/__init__.py +++ b/src/octoprint/plugins/pluginmanager/__init__.py @@ -15,7 +15,7 @@ from octoprint.server import admin_permission, VERSION from octoprint.util.pip import LocalPipCaller, UnknownPip from flask import jsonify, make_response -from flask.ext.babel import gettext +from flask_babel import gettext import logging import sarge diff --git a/src/octoprint/plugins/softwareupdate/__init__.py b/src/octoprint/plugins/softwareupdate/__init__.py index 7a3ac351..a156f419 100644 --- a/src/octoprint/plugins/softwareupdate/__init__.py +++ b/src/octoprint/plugins/softwareupdate/__init__.py @@ -491,7 +491,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, ##~~ TemplatePlugin API def get_template_configs(self): - from flask.ext.babel import gettext + from flask_babel import gettext return [ dict(type="settings", name=gettext("Software Update")) ] @@ -806,7 +806,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, result = dict(check) if target == "octoprint": - from flask.ext.babel import gettext + from flask_babel import gettext result["displayName"] = check.get("displayName", gettext("OctoPrint")) result["displayVersion"] = check.get("displayVersion", "{octoprint_version}") diff --git a/src/octoprint/server/__init__.py b/src/octoprint/server/__init__.py index 17308a26..aca26908 100644 --- a/src/octoprint/server/__init__.py +++ b/src/octoprint/server/__init__.py @@ -8,10 +8,10 @@ __copyright__ = "Copyright (C) 2014 The OctoPrint Project - Released under terms import uuid from sockjs.tornado import SockJSRouter from flask import Flask, g, request, session, Blueprint, Request, Response -from flask.ext.login import LoginManager, current_user -from flask.ext.principal import Principal, Permission, RoleNeed, identity_loaded, UserNeed -from flask.ext.babel import Babel, gettext, ngettext -from flask.ext.assets import Environment, Bundle +from flask_login import LoginManager, current_user +from flask_principal import Principal, Permission, RoleNeed, identity_loaded, UserNeed +from flask_babel import Babel, gettext, ngettext +from flask_assets import Environment, Bundle from babel import Locale from watchdog.observers import Observer from watchdog.observers.polling import PollingObserver diff --git a/src/octoprint/server/api/__init__.py b/src/octoprint/server/api/__init__.py index 6f6f37d5..5e7afb35 100644 --- a/src/octoprint/server/api/__init__.py +++ b/src/octoprint/server/api/__init__.py @@ -10,8 +10,8 @@ import netaddr import sarge from flask import Blueprint, request, jsonify, abort, current_app, session, make_response, g -from flask.ext.login import login_user, logout_user, current_user -from flask.ext.principal import Identity, identity_changed, AnonymousIdentity +from flask_login import login_user, logout_user, current_user +from flask_principal import Identity, identity_changed, AnonymousIdentity import octoprint.util as util import octoprint.users diff --git a/src/octoprint/server/api/languages.py b/src/octoprint/server/api/languages.py index e0749658..3d5f1f2c 100644 --- a/src/octoprint/server/api/languages.py +++ b/src/octoprint/server/api/languages.py @@ -26,7 +26,7 @@ from octoprint.server.util.flask import restricted_access from octoprint.plugin import plugin_manager -from flask.ext.babel import Locale +from flask_babel import Locale @api.route("/languages", methods=["GET"]) @restricted_access diff --git a/src/octoprint/server/api/system.py b/src/octoprint/server/api/system.py index 8af7a24c..fbdec959 100644 --- a/src/octoprint/server/api/system.py +++ b/src/octoprint/server/api/system.py @@ -9,7 +9,7 @@ import logging import sarge from flask import request, make_response, jsonify, url_for -from flask.ext.babel import gettext +from flask_babel import gettext from octoprint.settings import settings as s diff --git a/src/octoprint/server/api/users.py b/src/octoprint/server/api/users.py index 73233f5e..8335315f 100644 --- a/src/octoprint/server/api/users.py +++ b/src/octoprint/server/api/users.py @@ -7,7 +7,7 @@ __copyright__ = "Copyright (C) 2014 The OctoPrint Project - Released under terms from flask import request, jsonify, abort, make_response from werkzeug.exceptions import BadRequest -from flask.ext.login import current_user +from flask_login import current_user import octoprint.users as users diff --git a/src/octoprint/server/util/flask.py b/src/octoprint/server/util/flask.py index f4281ee1..ee7fe883 100644 --- a/src/octoprint/server/util/flask.py +++ b/src/octoprint/server/util/flask.py @@ -8,9 +8,9 @@ __copyright__ = "Copyright (C) 2014 The OctoPrint Project - Released under terms import tornado.web import flask -import flask.ext.login -import flask.ext.principal -import flask.ext.assets +import flask_login +import flask_principal +import flask_assets import webassets.updater import webassets.utils import functools @@ -40,7 +40,7 @@ def enable_additional_translations(default_locale="en", additional_folders=None) import os from flask import _request_ctx_stack from babel import support, Locale - import flask.ext.babel + import flask_babel if additional_folders is None: additional_folders = [] @@ -85,7 +85,7 @@ def enable_additional_translations(default_locale="en", additional_folders=None) return None translations = getattr(ctx, 'babel_translations', None) if translations is None: - locale = flask.ext.babel.get_locale() + locale = flask_babel.get_locale() translations = support.Translations() if str(locale) != default_locale: @@ -123,8 +123,8 @@ def enable_additional_translations(default_locale="en", additional_folders=None) ctx.babel_translations = translations return translations - flask.ext.babel.Babel.list_translations = fixed_list_translations - flask.ext.babel.get_translations = fixed_get_translations + flask_babel.Babel.list_translations = fixed_list_translations + flask_babel.get_translations = fixed_get_translations def fix_webassets_cache(): from webassets import cache @@ -426,12 +426,12 @@ class OctoPrintFlaskResponse(flask.Response): def passive_login(): if octoprint.server.userManager.enabled: - user = octoprint.server.userManager.login_user(flask.ext.login.current_user) + user = octoprint.server.userManager.login_user(flask_login.current_user) else: - user = flask.ext.login.current_user + user = flask_login.current_user - if user is not None and not user.is_anonymous(): - flask.ext.principal.identity_changed.send(flask.current_app._get_current_object(), identity=flask.ext.principal.Identity(user.get_id())) + if user is not None and not user.is_anonymous: + flask_principal.identity_changed.send(flask.current_app._get_current_object(), identity=flask_principal.Identity(user.get_id())) if hasattr(user, "get_session"): flask.session["usersession.id"] = user.get_session() flask.g.user = user @@ -453,8 +453,8 @@ def passive_login(): user = octoprint.server.userManager.login_user(user) flask.session["usersession.id"] = user.get_session() flask.g.user = user - flask.ext.login.login_user(user) - flask.ext.principal.identity_changed.send(flask.current_app._get_current_object(), identity=flask.ext.principal.Identity(user.get_id())) + flask_login.login_user(user) + flask_principal.identity_changed.send(flask.current_app._get_current_object(), identity=flask_principal.Identity(user.get_id())) return flask.jsonify(user.asDict()) except: logger = logging.getLogger(__name__) @@ -999,14 +999,14 @@ def _get_flask_user_from_request(request): :return: the user or None if no user could be determined """ import octoprint.server.util - import flask.ext.login + import flask_login from octoprint.settings import settings apikey = octoprint.server.util.get_api_key(request) if settings().getBoolean(["api", "enabled"]) and apikey is not None: user = octoprint.server.util.get_user_for_apikey(apikey) else: - user = flask.ext.login.current_user + user = flask_login.current_user return user @@ -1061,7 +1061,7 @@ def restricted_access(func): apikey = octoprint.server.util.get_api_key(flask.request) if apikey == octoprint.server.UI_API_KEY: # UI API key => call regular login_required decorator, we are using browser sessions here - return flask.ext.login.login_required(func)(*args, **kwargs) + return flask_login.login_required(func)(*args, **kwargs) # try to determine user for key user = octoprint.server.util.get_user_for_apikey(apikey) @@ -1069,11 +1069,11 @@ def restricted_access(func): # no user or no key => go away return flask.make_response("Invalid API key", 401) - if not flask.ext.login.login_user(user, remember=False): + if not flask_login.login_user(user, remember=False): # user for API key could not be logged in => go away return flask.make_response("Invalid API key", 401) - flask.ext.principal.identity_changed.send(flask.current_app._get_current_object(), identity=flask.ext.principal.Identity(user.get_id())) + flask_principal.identity_changed.send(flask.current_app._get_current_object(), identity=flask_principal.Identity(user.get_id())) return func(*args, **kwargs) return decorated_view @@ -1172,7 +1172,7 @@ def get_json_command_from_request(request, valid_commands): ##~~ Flask-Assets resolver with plugin asset support -class PluginAssetResolver(flask.ext.assets.FlaskResolver): +class PluginAssetResolver(flask_assets.FlaskResolver): def split_prefix(self, ctx, item): app = ctx.environment._app @@ -1181,14 +1181,14 @@ class PluginAssetResolver(flask.ext.assets.FlaskResolver): prefix, plugin, name = item.split("/", 2) blueprint = prefix + "." + plugin - directory = flask.ext.assets.get_static_folder(app.blueprints[blueprint]) + directory = flask_assets.get_static_folder(app.blueprints[blueprint]) item = name endpoint = blueprint + ".static" return directory, item, endpoint except (ValueError, KeyError): pass - return flask.ext.assets.FlaskResolver.split_prefix(self, ctx, item) + return flask_assets.FlaskResolver.split_prefix(self, ctx, item) def resolve_output_to_path(self, ctx, target, bundle): import os diff --git a/src/octoprint/users.py b/src/octoprint/users.py index a615d222..e5761773 100644 --- a/src/octoprint/users.py +++ b/src/octoprint/users.py @@ -5,8 +5,8 @@ __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' __copyright__ = "Copyright (C) 2014 The OctoPrint Project - Released under terms of the AGPLv3 License" -from flask.ext.login import UserMixin -from flask.ext.principal import Identity +from flask_login import UserMixin +from flask_principal import Identity from werkzeug.local import LocalProxy import hashlib import os From 87d65c150b043efa20a666f7bbf326492abd5ee9 Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Thu, 6 Oct 2016 20:30:12 -0500 Subject: [PATCH 02/15] Update werkzeug --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index eaa06d68..950f4b28 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ import octoprint_setuptools # Requirements for our application INSTALL_REQUIRES = [ "flask>=0.11,<0.12", - "werkzeug>=0.8.3,<0.9", + "werkzeug>=0.11.1,<0.12", "tornado>=4.0.2,<4.1", "sockjs-tornado>=1.0.2,<1.1", "PyYAML>=3.10,<3.11", From fbb881bb426d6cd398fa039731545901dc8f59f4 Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Thu, 6 Oct 2016 21:00:14 -0500 Subject: [PATCH 03/15] Update Tornado, adapt CustomHTTPServer to new usage --- setup.py | 2 +- src/octoprint/server/util/tornado.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 950f4b28..26c473d6 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ import octoprint_setuptools INSTALL_REQUIRES = [ "flask>=0.11,<0.12", "werkzeug>=0.11.1,<0.12", - "tornado>=4.0.2,<4.1", + "tornado>=4.4.2,<4.5", "sockjs-tornado>=1.0.2,<1.1", "PyYAML>=3.10,<3.11", "Flask-Login>=0.3,<0.4", diff --git a/src/octoprint/server/util/tornado.py b/src/octoprint/server/util/tornado.py index 12ba3b9b..54eb0955 100644 --- a/src/octoprint/server/util/tornado.py +++ b/src/octoprint/server/util/tornado.py @@ -672,8 +672,10 @@ class CustomHTTPServer(tornado.httpserver.HTTPServer): ``default_max_body_size`` is the default maximum body size to apply if no specific one from ``max_body_sizes`` matches. """ + def __init__(self, *args, **kwargs): + pass - def __init__(self, request_callback, no_keep_alive=False, io_loop=None, + def initialize(self, request_callback, no_keep_alive=False, io_loop=None, xheaders=False, ssl_options=None, protocol=None, decompress_request=False, chunk_size=None, max_header_size=None, From 9a6da3f46f65462a26349bfea8671733772ef07b Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Thu, 6 Oct 2016 21:03:29 -0500 Subject: [PATCH 04/15] Update PyYAML --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 26c473d6..0a9ae65e 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ INSTALL_REQUIRES = [ "werkzeug>=0.11.1,<0.12", "tornado>=4.4.2,<4.5", "sockjs-tornado>=1.0.2,<1.1", - "PyYAML>=3.10,<3.11", + "PyYAML>=3.12,<3.13", "Flask-Login>=0.3,<0.4", "Flask-Principal>=0.4,<0.5", "Flask-Babel>=0.11,<0.12", From 23a28012841baf3f21302ba97757f546b2a3270e Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Thu, 6 Oct 2016 21:08:45 -0500 Subject: [PATCH 05/15] Update pyserial --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 0a9ae65e..3ada2056 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ INSTALL_REQUIRES = [ "Flask-Babel>=0.11,<0.12", "Flask-Assets>=0.12,<0.13", "markdown>=2.6.4,<2.7", - "pyserial>=2.7,<2.8", + "pyserial>=3.1.1,<3.2", "netaddr>=0.7.17,<0.8", "watchdog>=0.8.3,<0.9", "sarge>=0.1.4,<0.2", From e15ca55558324f6af5084291ca65883a56ce9491 Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Thu, 6 Oct 2016 21:11:33 -0500 Subject: [PATCH 06/15] Update rsa --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 3ada2056..ca0091e9 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ INSTALL_REQUIRES = [ "sarge>=0.1.4,<0.2", "netifaces>=0.10,<0.11", "pylru>=1.0.9,<1.1", - "rsa>=3.2,<3.3", + "rsa>=3.4,<3.5", "pkginfo>=1.2.1,<1.3", "requests>=2.7,<2.8", "semantic_version>=2.4.2,<2.5", From e998edd083bf2715706339e3b35f3a9c4f8353eb Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Thu, 6 Oct 2016 21:12:46 -0500 Subject: [PATCH 07/15] Update pkginfo --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ca0091e9..bd8a6841 100644 --- a/setup.py +++ b/setup.py @@ -31,7 +31,7 @@ INSTALL_REQUIRES = [ "netifaces>=0.10,<0.11", "pylru>=1.0.9,<1.1", "rsa>=3.4,<3.5", - "pkginfo>=1.2.1,<1.3", + "pkginfo>=1.3.2,<1.4", "requests>=2.7,<2.8", "semantic_version>=2.4.2,<2.5", "psutil>=3.2.1,<3.3", From 599e24634cf5e7c5f14df8729cfe51f16957066f Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Thu, 6 Oct 2016 21:16:31 -0500 Subject: [PATCH 08/15] Update requests --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index bd8a6841..0cd0ac2b 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ INSTALL_REQUIRES = [ "pylru>=1.0.9,<1.1", "rsa>=3.4,<3.5", "pkginfo>=1.3.2,<1.4", - "requests>=2.7,<2.8", + "requests>=2.11.1,<2.12", "semantic_version>=2.4.2,<2.5", "psutil>=3.2.1,<3.3", "Click>=6.2,<6.3", From 7d091d18ee552e1124367352c30d14944f10351d Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Thu, 6 Oct 2016 21:19:54 -0500 Subject: [PATCH 09/15] Update semantic_version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 0cd0ac2b..4c7d4894 100644 --- a/setup.py +++ b/setup.py @@ -33,7 +33,7 @@ INSTALL_REQUIRES = [ "rsa>=3.4,<3.5", "pkginfo>=1.3.2,<1.4", "requests>=2.11.1,<2.12", - "semantic_version>=2.4.2,<2.5", + "semantic_version>=2.6.0,<2.7", "psutil>=3.2.1,<3.3", "Click>=6.2,<6.3", "awesome-slugify>=1.6.5,<1.7", From bc54ddf19f26e0cf0526d25d5a654a7eb67d6e08 Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Thu, 6 Oct 2016 21:25:48 -0500 Subject: [PATCH 10/15] Update psutil --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 4c7d4894..52965618 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,7 @@ INSTALL_REQUIRES = [ "pkginfo>=1.3.2,<1.4", "requests>=2.11.1,<2.12", "semantic_version>=2.6.0,<2.7", - "psutil>=3.2.1,<3.3", + "psutil>=4.3.1,<4.4", "Click>=6.2,<6.3", "awesome-slugify>=1.6.5,<1.7", "feedparser>=5.2.1,<5.3", From 943d7ce31a02f3cec8894e92b5797c58b1b766dc Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Thu, 6 Oct 2016 21:35:43 -0500 Subject: [PATCH 11/15] Update Click --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 52965618..41e9a56d 100644 --- a/setup.py +++ b/setup.py @@ -35,7 +35,7 @@ INSTALL_REQUIRES = [ "requests>=2.11.1,<2.12", "semantic_version>=2.6.0,<2.7", "psutil>=4.3.1,<4.4", - "Click>=6.2,<6.3", + "Click>=6.6,<6.7", "awesome-slugify>=1.6.5,<1.7", "feedparser>=5.2.1,<5.3", "chainmap>=1.0.2,<1.1", From 37f51ef983fb38ebc6f761842add961c446cdee0 Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Fri, 7 Oct 2016 11:37:36 -0500 Subject: [PATCH 12/15] Botched the initial Flask-Login update -- is_active(), is_authenticated(), and is_anonymous() got converted into properties, so we should do the same --- src/octoprint/plugin/types.py | 4 ++-- src/octoprint/server/__init__.py | 4 ++-- src/octoprint/server/api/__init__.py | 4 ++-- src/octoprint/server/api/users.py | 12 ++++++------ src/octoprint/server/util/flask.py | 4 ++-- src/octoprint/users.py | 13 ++++++++----- 6 files changed, 22 insertions(+), 19 deletions(-) diff --git a/src/octoprint/plugin/types.py b/src/octoprint/plugin/types.py index f9659e7d..dd17d7a7 100644 --- a/src/octoprint/plugin/types.py +++ b/src/octoprint/plugin/types.py @@ -1400,8 +1400,8 @@ class SettingsPlugin(OctoPrintPlugin): if key in node: node[key] = None - conditions = dict(user=lambda: current_user is not None and not current_user.is_anonymous(), - admin=lambda: current_user is not None and not current_user.is_anonymous() and current_user.is_admin(), + conditions = dict(user=lambda: current_user is not None and not current_user.is_anonymous, + admin=lambda: current_user is not None and not current_user.is_anonymous and current_user.is_admin, never=lambda: False) for level, condition in conditions.items(): diff --git a/src/octoprint/server/__init__.py b/src/octoprint/server/__init__.py index aca26908..bbedc609 100644 --- a/src/octoprint/server/__init__.py +++ b/src/octoprint/server/__init__.py @@ -86,9 +86,9 @@ def on_identity_loaded(sender, identity): return identity.provides.add(UserNeed(user.get_id())) - if user.is_user(): + if user.is_user: identity.provides.add(RoleNeed("user")) - if user.is_admin(): + if user.is_admin: identity.provides.add(RoleNeed("admin")) def load_user(id): diff --git a/src/octoprint/server/api/__init__.py b/src/octoprint/server/api/__init__.py index 5e7afb35..7602ae18 100644 --- a/src/octoprint/server/api/__init__.py +++ b/src/octoprint/server/api/__init__.py @@ -60,7 +60,7 @@ def pluginData(name): return make_response("More than one api provider registered for {name}, can't proceed".format(name=name), 500) api_plugin = api_plugins[0] - if api_plugin.is_api_adminonly() and not current_user.is_admin(): + if api_plugin.is_api_adminonly() and not current_user.is_admin: return make_response("Forbidden", 403) response = api_plugin.on_api_get(request) @@ -87,7 +87,7 @@ def pluginCommand(name): if valid_commands is None: return make_response("Method not allowed", 405) - if api_plugin.is_api_adminonly() and not current_user.is_admin(): + if api_plugin.is_api_adminonly() and not current_user.is_admin: return make_response("Forbidden", 403) command, data, response = get_json_command_from_request(request, valid_commands) diff --git a/src/octoprint/server/api/users.py b/src/octoprint/server/api/users.py index 8335315f..fbee5c16 100644 --- a/src/octoprint/server/api/users.py +++ b/src/octoprint/server/api/users.py @@ -72,7 +72,7 @@ def getUser(username): if not userManager.enabled: return jsonify(SUCCESS) - if current_user is not None and not current_user.is_anonymous() and (current_user.get_name() == username or current_user.is_admin()): + if current_user is not None and not current_user.is_anonymous and (current_user.get_name() == username or current_user.is_admin): user = userManager.findUser(username) if user is not None: return jsonify(user.asDict()) @@ -133,7 +133,7 @@ def changePasswordForUser(username): if not userManager.enabled: return jsonify(SUCCESS) - if current_user is not None and not current_user.is_anonymous() and (current_user.get_name() == username or current_user.is_admin()): + if current_user is not None and not current_user.is_anonymous and (current_user.get_name() == username or current_user.is_admin): if not "application/json" in request.headers["Content-Type"]: return make_response("Expected content-type JSON", 400) @@ -161,7 +161,7 @@ def getSettingsForUser(username): if not userManager.enabled: return jsonify(SUCCESS) - if current_user is None or current_user.is_anonymous() or (current_user.get_name() != username and not current_user.is_admin()): + if current_user is None or current_user.is_anonymous or (current_user.get_name() != username and not current_user.is_admin): return make_response("Forbidden", 403) try: @@ -175,7 +175,7 @@ def changeSettingsForUser(username): if not userManager.enabled: return jsonify(SUCCESS) - if current_user is None or current_user.is_anonymous() or (current_user.get_name() != username and not current_user.is_admin()): + if current_user is None or current_user.is_anonymous or (current_user.get_name() != username and not current_user.is_admin): return make_response("Forbidden", 403) try: @@ -195,7 +195,7 @@ def deleteApikeyForUser(username): if not userManager.enabled: return jsonify(SUCCESS) - if current_user is not None and not current_user.is_anonymous() and (current_user.get_name() == username or current_user.is_admin()): + if current_user is not None and not current_user.is_anonymous and (current_user.get_name() == username or current_user.is_admin): try: userManager.deleteApikey(username) except users.UnknownUser: @@ -211,7 +211,7 @@ def generateApikeyForUser(username): if not userManager.enabled: return jsonify(SUCCESS) - if current_user is not None and not current_user.is_anonymous() and (current_user.get_name() == username or current_user.is_admin()): + if current_user is not None and not current_user.is_anonymous and (current_user.get_name() == username or current_user.is_admin): try: apikey = userManager.generateApiKey(username) except users.UnknownUser: diff --git a/src/octoprint/server/util/flask.py b/src/octoprint/server/util/flask.py index ee7fe883..d7aca094 100644 --- a/src/octoprint/server/util/flask.py +++ b/src/octoprint/server/util/flask.py @@ -971,7 +971,7 @@ def admin_validator(request): """ user = _get_flask_user_from_request(request) - if user is None or not user.is_authenticated() or not user.is_admin(): + if user is None or not user.is_authenticated or not user.is_admin: raise tornado.web.HTTPError(403) @@ -986,7 +986,7 @@ def user_validator(request): """ user = _get_flask_user_from_request(request) - if user is None or not user.is_authenticated(): + if user is None or not user.is_authenticated: raise tornado.web.HTTPError(403) diff --git a/src/octoprint/users.py b/src/octoprint/users.py index e5761773..1ce377a0 100644 --- a/src/octoprint/users.py +++ b/src/octoprint/users.py @@ -428,9 +428,9 @@ class User(UserMixin): def asDict(self): return { "name": self._username, - "active": self.is_active(), - "admin": self.is_admin(), - "user": self.is_user(), + "active": self.is_active, + "admin": self.is_admin, + "user": self.is_user, "apikey": self._apikey, "settings": self._settings } @@ -444,12 +444,15 @@ class User(UserMixin): def get_name(self): return self._username + @property def is_active(self): return self._active + @property def is_user(self): return "user" in self._roles + @property def is_admin(self): return "admin" in self._roles @@ -496,7 +499,7 @@ class User(UserMixin): return True def __repr__(self): - return "User(id=%s,name=%s,active=%r,user=%r,admin=%r)" % (self.get_id(), self.get_name(), self.is_active(), self.is_user(), self.is_admin()) + return "User(id=%s,name=%s,active=%r,user=%r,admin=%r)" % (self.get_id(), self.get_name(), self.is_active, self.is_user, self.is_admin) class SessionUser(User): def __init__(self, user): @@ -526,7 +529,7 @@ class SessionUser(User): return self._session def __repr__(self): - return "SessionUser(id=%s,name=%s,active=%r,user=%r,admin=%r,session=%s,created=%s)" % (self.get_id(), self.get_name(), self.is_active(), self.is_user(), self.is_admin(), self._session, self._created) + return "SessionUser(id=%s,name=%s,active=%r,user=%r,admin=%r,session=%s,created=%s)" % (self.get_id(), self.get_name(), self.is_active, self.is_user, self.is_admin, self._session, self._created) ##~~ DummyUser object to use when accessControl is disabled From 35d480bc482333e99f1785aca7259d7799dd4537 Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Tue, 25 Oct 2016 21:36:47 -0500 Subject: [PATCH 13/15] Clean up bogus whitespace changes/inconsistency --- src/octoprint/server/util/flask.py | 2 +- src/octoprint/server/util/tornado.py | 4 ++-- src/octoprint/users.py | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/octoprint/server/util/flask.py b/src/octoprint/server/util/flask.py index d7aca094..a0292ad1 100644 --- a/src/octoprint/server/util/flask.py +++ b/src/octoprint/server/util/flask.py @@ -426,7 +426,7 @@ class OctoPrintFlaskResponse(flask.Response): def passive_login(): if octoprint.server.userManager.enabled: - user = octoprint.server.userManager.login_user(flask_login.current_user) + user = octoprint.server.userManager.login_user(flask_login.current_user) else: user = flask_login.current_user diff --git a/src/octoprint/server/util/tornado.py b/src/octoprint/server/util/tornado.py index 54eb0955..e599d151 100644 --- a/src/octoprint/server/util/tornado.py +++ b/src/octoprint/server/util/tornado.py @@ -672,8 +672,8 @@ class CustomHTTPServer(tornado.httpserver.HTTPServer): ``default_max_body_size`` is the default maximum body size to apply if no specific one from ``max_body_sizes`` matches. """ - def __init__(self, *args, **kwargs): - pass + def __init__(self, *args, **kwargs): + pass def initialize(self, request_callback, no_keep_alive=False, io_loop=None, xheaders=False, ssl_options=None, protocol=None, diff --git a/src/octoprint/users.py b/src/octoprint/users.py index 1ce377a0..d7d4d1e4 100644 --- a/src/octoprint/users.py +++ b/src/octoprint/users.py @@ -444,15 +444,15 @@ class User(UserMixin): def get_name(self): return self._username - @property + @property def is_active(self): return self._active - @property + @property def is_user(self): return "user" in self._roles - @property + @property def is_admin(self): return "admin" in self._roles From f318cc5e284ef437e80350a61b137ae172eceadd Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Thu, 10 Nov 2016 13:12:02 -0600 Subject: [PATCH 14/15] Update 970880d, flask.ext.login -> flask_login --- src/octoprint/server/api/settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/octoprint/server/api/settings.py b/src/octoprint/server/api/settings.py index b4d862ae..0225ad81 100644 --- a/src/octoprint/server/api/settings.py +++ b/src/octoprint/server/api/settings.py @@ -8,7 +8,7 @@ __copyright__ = "Copyright (C) 2014 The OctoPrint Project - Released under terms import logging from flask import request, jsonify, make_response -from flask.ext.login import current_user +from flask_login import current_user from werkzeug.exceptions import BadRequest from octoprint.events import eventManager, Events @@ -32,7 +32,7 @@ def _etag(lm=None): connection_options = printer.__class__.get_connection_options() plugins = sorted(octoprint.plugin.plugin_manager().enabled_plugins) - if current_user is not None and not current_user.is_anonymous(): + if current_user is not None and not current_user.is_anonymous: roles = sorted(current_user.roles) else: roles = [] From 639619ff939c00befadbc5ded213200cae431a9c Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Mon, 9 Jan 2017 08:51:52 -0600 Subject: [PATCH 15/15] Partially revert 57de36a --- src/octoprint/server/__init__.py | 3 +-- src/octoprint/server/util/tornado.py | 30 ---------------------------- 2 files changed, 1 insertion(+), 32 deletions(-) diff --git a/src/octoprint/server/__init__.py b/src/octoprint/server/__init__.py index 4c60edc9..e9a432c7 100644 --- a/src/octoprint/server/__init__.py +++ b/src/octoprint/server/__init__.py @@ -168,8 +168,7 @@ class Server(object): self._logger = logging.getLogger(__name__) pluginManager = self._plugin_manager - # monkey patch a bunch of stuff - util.tornado.fix_ioloop_scheduling() + # monkey patch some stuff util.flask.enable_additional_translations(additional_folders=[self._settings.getBaseFolder("translations")]) # setup app diff --git a/src/octoprint/server/util/tornado.py b/src/octoprint/server/util/tornado.py index e599d151..8325bcaf 100644 --- a/src/octoprint/server/util/tornado.py +++ b/src/octoprint/server/util/tornado.py @@ -29,36 +29,6 @@ import tornado.util import octoprint.util -#~~ Monkey patching - - -def fix_ioloop_scheduling(): - """ - This monkey patches tornado's :meth:``tornado.ioloop.PeriodicCallback._schedule_next`` method so it no longer - blocks for long times on slow machines (RPi) when the system time happens to change by a large amount (e.g. due to - the first ever contact to an NTP server). - - Patch by @nosyjoe on Github. See this PR against tornado: https://github.com/tornadoweb/tornado/pull/1290 - """ - - import math - - # patched implementation taken from PR - def _schedule_next(self): - if self._running: - current_time = self.io_loop.time() - - if self._next_timeout <= current_time: - callback_time_sec = self.callback_time / 1000.0 - self._next_timeout += (math.floor((current_time - self._next_timeout) / callback_time_sec) + 1) * callback_time_sec - - self._timeout = self.io_loop.add_timeout(self._next_timeout, self._run) - - # replace original implementation with patched version - import tornado.ioloop - tornado.ioloop.PeriodicCallback._schedule_next = _schedule_next - - #~~ WSGI middleware