Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
6 changes: 4 additions & 2 deletions continuous_integration/recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ build:
number: {{ GIT_DESCRIBE_NUMBER }}
noarch: python
entry_points:
- dask-sql-server = dask_sql.server.app:main
# TODO: re-enable server once CVEs are resolved
# - dask-sql-server = dask_sql.server.app:main
- dask-sql = dask_sql.cmd:main
string: py_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
script: {{ PYTHON }} -m pip install . --no-deps -vv
Expand Down Expand Up @@ -45,7 +46,8 @@ test:
- dask_sql
commands:
- pip check
- dask-sql-server --help
# TODO: re-enable server once CVEs are resolved
# - dask-sql-server --help
- dask-sql --help
requires:
- pip
Expand Down
7 changes: 5 additions & 2 deletions dask_sql/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@
from .cmd import cmd_loop
from .context import Context
from .datacontainer import Statistics
from .server.app import run_server

# from .server.app import run_server

__version__ = get_versions()["version"]
del get_versions

__all__ = [__version__, cmd_loop, Context, run_server, Statistics]
# TODO: re-enable server once CVEs are resolved
# __all__ = [__version__, cmd_loop, Context, run_server, Statistics]
__all__ = [__version__, cmd_loop, Context, Statistics]
8 changes: 7 additions & 1 deletion dask_sql/context.py
Original file line number Diff line number Diff line change
Expand Up @@ -656,10 +656,13 @@ def run_server(
port (:obj:`int`): The port to listen on (defaults to 8080)
log_level: (:obj:`str`): The log level of the server and dask-sql
"""
# TODO: re-enable server once CVEs are resolved
raise NotImplementedError

from dask_sql.server.app import run_server

self.stop_server()
self.server = run_server(
self.sql_server = run_server(
context=self,
client=client,
host=host,
Expand All @@ -672,6 +675,9 @@ def stop_server(self): # pragma: no cover
"""
Stop a SQL server started by ``run_server``.
"""
# TODO: re-enable server once CVEs are resolved
raise NotImplementedError

if self.sql_server is not None:
loop = asyncio.get_event_loop()
assert loop
Expand Down
4 changes: 4 additions & 0 deletions docs/source/server.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
SQL Server
==========

.. warning::

``dask-sql``'s SQL server functionality is currently exploitable and has been disable until the exposed vulnerabilites can be resolve.
Comment thread
charlesbluca marked this conversation as resolved.
Outdated

``dask-sql`` comes with a small test implementation for a SQL server.
Instead of rebuilding a full ODBC driver, we re-use the `presto wire protocol <https://github.com/prestodb/presto/wiki/HTTP-Protocol>`_.

Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@ def build(self):
},
entry_points={
"console_scripts": [
"dask-sql-server = dask_sql.server.app:main",
# TODO: re-enable server once CVEs are resolved
# "dask-sql-server = dask_sql.server.app:main",
"dask-sql = dask_sql.cmd:main",
]
},
Expand Down