Skip to content
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.

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

Enable broker support on Linux for WSL #766

Open
wants to merge 29 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
d2fc35f
Enable broker support on Linux
DharshanBJ Nov 7, 2024
edf77b4
update version number
DharshanBJ Nov 7, 2024
3bf9111
Update sample/interactive_sample.py
DharshanBJ Nov 9, 2024
caab447
Update msal/application.py
DharshanBJ Nov 9, 2024
aa5c74c
Update tests/broker-test.py
DharshanBJ Nov 9, 2024
6f52d28
revert back release version bump
DharshanBJ Nov 9, 2024
57d0005
Merge branch 'dev' into dharshanb/brokerSupportLinux
DharshanBJ Dec 11, 2024
e2cc47e
address comments
DharshanBJ Jan 13, 2025
1965976
address comment
DharshanBJ Jan 13, 2025
46713ac
update approximate version hint
DharshanBJ Jan 14, 2025
2bab25c
Merge branch 'dev' into dharshanb/brokerSupportLinux
DharshanBJ Jan 15, 2025
7037231
update
DharshanBJ Jan 24, 2025
dafe15f
Merge branch 'dharshanb/brokerSupportLinux' of https://github.com/Azu…
DharshanBJ Jan 24, 2025
89ef887
Update msal/application.py
DharshanBJ Feb 18, 2025
25832df
Merge branch 'dev' into dharshanb/brokerSupportLinux
DharshanBJ Feb 18, 2025
f2df4f8
Resolve merge conflicts
DharshanBJ Mar 10, 2025
3ca5fcf
Address comments
DharshanBJ Mar 10, 2025
790bc78
Update
DharshanBJ Mar 10, 2025
d719095
Add enable_broker_on_wsl flag
DharshanBJ Mar 10, 2025
6806041
Address comments
DharshanBJ Mar 10, 2025
c429d2a
Merge branch 'dev' into dharshanb/brokerSupportLinux
DharshanBJ Mar 11, 2025
5c3ce72
Update msal/__main__.py
DharshanBJ Mar 11, 2025
bf7a937
Update tests/test_e2e.py
DharshanBJ Mar 11, 2025
adbca96
Update msal/application.py
DharshanBJ Mar 11, 2025
fd29c01
Update msal/application.py
DharshanBJ Mar 11, 2025
e25ef34
Merge branch 'dev' into dharshanb/brokerSupportLinux
DharshanBJ Mar 11, 2025
f31d9a0
Bump up msal py version to 1.33
DharshanBJ Mar 28, 2025
e69bf25
Update msal/application.py
DharshanBJ Mar 31, 2025
dc85e58
Merge branch 'dev' into dharshanb/brokerSupportLinux
DharshanBJ Mar 31, 2025
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
1 change: 1 addition & 0 deletions msal/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,7 @@ def _main():
instance_discovery=instance_discovery,
enable_broker_on_windows=enable_broker,
enable_broker_on_mac=enable_broker,
enable_broker_on_linux=enable_broker,
enable_pii_log=enable_pii_log,
token_cache=global_cache,
) if not is_cca else msal.ConfidentialClientApplication(
Expand Down
14 changes: 11 additions & 3 deletions msal/application.py
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,7 @@ def _decide_broker(self, allow_broker, enable_pii_log):
"allow_broker is deprecated. "
"Please use PublicClientApplication(..., "
"enable_broker_on_windows=True, "
"enable_broker_on_mac=...)",
"...)",
DeprecationWarning)
opted_in_for_broker = (
self._enable_broker # True means Opted-in from PCA
Expand Down Expand Up @@ -1921,7 +1921,7 @@ def __init__(self, client_id, client_credential=None, **kwargs):

.. note::

You may set enable_broker_on_windows and/or enable_broker_on_mac to True.
You may set enable_broker_on_windows and/or enable_broker_on_mac and/or enable_broker_on_linux to True.

**What is a broker, and why use it?**

Expand Down Expand Up @@ -1989,15 +1989,23 @@ def __init__(self, client_id, client_credential=None, **kwargs):
This parameter defaults to None, which means MSAL will not utilize a broker.

New in MSAL Python 1.31.0.

:param boolean enable_broker_on_linux:
This setting is only effective if your app is running on Linux.
This parameter defaults to None, which means MSAL will not utilize a broker.

New in MSAL Python 1.32.0.
"""
if client_credential is not None:
raise ValueError("Public Client should not possess credentials")
# Using kwargs notation for now. We will switch to keyword-only arguments.
enable_broker_on_windows = kwargs.pop("enable_broker_on_windows", False)
enable_broker_on_mac = kwargs.pop("enable_broker_on_mac", False)
enable_broker_on_linux = kwargs.pop("enable_broker_on_linux", False)
self._enable_broker = bool(
enable_broker_on_windows and sys.platform == "win32"
or enable_broker_on_mac and sys.platform == "darwin")
or enable_broker_on_mac and sys.platform == "darwin"
or enable_broker_on_linux and sys.platform == "linux")
super(PublicClientApplication, self).__init__(
client_id, client_credential=None, **kwargs)

Expand Down
2 changes: 1 addition & 1 deletion sample/interactive_sample.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
oidc_authority=os.getenv('OIDC_AUTHORITY'), # For External ID with custom domain
#enable_broker_on_windows=True, # Opted in. You will be guided to meet the prerequisites, if your app hasn't already
#enable_broker_on_mac=True, # Opted in. You will be guided to meet the prerequisites, if your app hasn't already

#enable_broker_on_linux=True, # Opted in. You will be guided to meet the prerequisites, if your app hasn't already
token_cache=global_token_cache, # Let this app (re)use an existing token cache.
# If absent, ClientApplication will create its own empty token cache
)
Expand Down
6 changes: 4 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,11 @@ broker =
# most existing MSAL Python apps do not have the redirect_uri needed by broker.
#
# We need pymsalruntime.CallbackData introduced in PyMsalRuntime 0.14
pymsalruntime>=0.14,<0.18; python_version>='3.6' and platform_system=='Windows'
pymsalruntime>=0.14,<0.19; python_version>='3.6' and platform_system=='Windows'
# On Mac, PyMsalRuntime 0.17+ is expected to support SSH cert and ROPC
pymsalruntime>=0.17,<0.18; python_version>='3.8' and platform_system=='Darwin'
pymsalruntime>=0.17,<0.19; python_version>='3.8' and platform_system=='Darwin'
# PyMsalRuntime 0.18+ is expected to support broker on Linux
pymsalruntime>=0.18,<0.19; python_version>='3.8' and platform_system=='Linux'

[options.packages.find]
exclude =
Expand Down
4 changes: 3 additions & 1 deletion tests/broker-test.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
_AZURE_CLI,
authority="https://login.microsoftonline.com/organizations",
enable_broker_on_mac=True,
enable_broker_on_windows=True)
enable_broker_on_windows=True,
enable_broker_on_linux=True,
)

def interactive_and_silent(scopes, auth_scheme, data, expected_token_type):
print("An account picker shall be pop up, possibly behind this console. Continue from there.")
Expand Down
1 change: 1 addition & 0 deletions tests/test_e2e.py
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ def _build_app(cls,
http_client=http_client or MinimalHttpClient(),
enable_broker_on_windows=broker_available,
enable_broker_on_mac=broker_available,
enable_broker_on_linux=broker_available,
)

def _test_username_password(self,
Expand Down