8000 Prevent third-party plugins with faulty hooks to crash the server by ccordoba12 · Pull Request #158 · python-lsp/python-lsp-server · GitHub
[go: up one dir, main page]
Skip to content

Prevent third-party plugins with faulty hooks to crash the server #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ccordoba12 merged 2 commits into from
Feb 2, 2022
Merged

Prevent third-party plugins with faulty hooks to crash the server #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4baee3
Prevent third-party plugins with faulty hooks to crash the server
ccordoba12 Feb 1, 2022
b53ffef
Require pluggy 1.0+
ccordoba12 Feb 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions pylsp/config/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@

import logging
from functools import lru_cache
import pkg_resources
from typing import List, Mapping, Sequence, Union

import pkg_resources
import pluggy
from pluggy._hooks import HookImpl

from pylsp import _utils, hookspecs, uris, PYLSP

Expand All @@ -16,6 +18,24 @@
DEFAULT_CONFIG_SOURCES = ['pycodestyle']


class PluginManager(pluggy.PluginManager):

def _hookexec(
self,
hook_name: str,
methods: Sequence[HookImpl],
kwargs: Mapping[str, object],
firstresult: bool,
) -> Union[object, List[object]]:
# called from all hookcaller instances.
# enable_tracing will set its own wrapping function at self._inner_hookexec
try:
return self._inner_hookexec(hook_name, methods, kwargs, firstresult)
except Exception as e: # pylint: disable=broad-except
log.warning(f"Failed to load hook {hook_name}: {e}")
return []


class Config:
def __init__(self, root_uri, init_opts, process_id, capabilities):
self._root_path = uris.to_fs_path(root_uri)
Expand All @@ -39,7 +59,7 @@ def __init__(self, root_uri, init_opts, process_id, capabilities):
except ImportError:
pass

self._pm = pluggy.PluginManager(PYLSP)
self._pm = PluginManager(PYLSP)
self._pm.trace.root.setwriter(log.debug)
self._pm.enable_tracing()
self._pm.add_hookspecs(hookspecs)
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ python_requires = >=3.7
install_requires =
jedi>=0.17.2,<0.19.0
python-lsp-jsonrpc>=1.0.0
pluggy
pluggy>=1.0.0
ujson>=3.0.0
setuptools>=39.0.0
setup_requires = setuptools>=44; wheel; setuptools_scm[toml]>=3.4.3
Expand Down
0