Skip to content

Respect security configuration (#2815) #2822

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
mrocklin merged 4 commits into from
Jul 10, 2019
Merged

Respect security configuration (#2815) #2822

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dc82f0c
Respect security configuration (#2815)
rbubley Jul 2, 2019
cd931ab
flake8
rbubley Jul 4, 2019
0d611b7
black
rbubley Jul 4, 2019
81a4da6
Changes per jcrist comment
rbubley Jul 10, 2019
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
7 changes: 6 additions & 1 deletion distributed/deploy/local.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
from .spec import SpecCluster
from ..nanny import Nanny
from ..scheduler import Scheduler
from ..security import Security
from ..worker import Worker, parse_memory_limit

logger = logging.getLogger(__name__)
Expand Down Expand Up @@ -123,11 +124,15 @@ def __init__(

self.status = None
self.processes = processes
security = security or Security()

if protocol is None:
if host and "://" in host:
protocol = host.split("://")[0]
elif security:
elif (
security
and security.get_connection_args("scheduler")["require_encryption"]

@jcrist jcrist Jul 9, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be:

elif security and security.require_encryption:

):
protocol = "tls://"
elif not self.processes and not scheduler_port:
protocol = "inproc://"
Expand Down