Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
7 changes: 1 addition & 6 deletions msal/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -216,11 +216,7 @@ def _remove_tokens_for_client(app):

def _exit(app):
"""Exit"""
bug_link = (
"https://identitydivision.visualstudio.com/Engineering/_queries/query/79b3a352-a775-406f-87cd-a487c382a8ed/"
if app._enable_broker else
"https://github.com/AzureAD/microsoft-authentication-library-for-python/issues/new/choose"
)
bug_link = "https://github.com/AzureAD/microsoft-authentication-library-for-python/issues/new/choose"
print("Bye. If you found a bug, please report it here: {}".format(bug_link))
sys.exit()

Expand Down Expand Up @@ -334,4 +330,3 @@ def _main():

if __name__ == "__main__":
_main()

58 changes: 29 additions & 29 deletions tests/microsoft.mex.xml
Original file line number Diff line number Diff line change
Expand Up @@ -648,9 +648,9 @@
</wsp:Policy>
<wsdl:types>
<xsd:schema targetNamespace="http://schemas.microsoft.com/ws/2008/06/identity/securitytokenservice/Imports">
<xsd:import schemaLocation="https://corp.sts.microsoft.com/adfs/services/trust/mex?xsd=xsd0" namespace="http://schemas.microsoft.com/Message"/>
<xsd:import schemaLocation="https://corp.sts.microsoft.com/adfs/services/trust/mex?xsd=xsd1" namespace="http://schemas.xmlsoap.org/ws/2005/02/trust"/>
<xsd:import schemaLocation="https://corp.sts.microsoft.com/adfs/services/trust/mex?xsd=xsd2" namespace="http://docs.oasis-open.org/ws-sx/ws-trust/200512"/>
<xsd:import schemaLocation="https://example.com/adfs/services/trust/mex?xsd=xsd0" namespace="http://schemas.microsoft.com/Message"/>
<xsd:import schemaLocation="https://example.com/adfs/services/trust/mex?xsd=xsd1" namespace="http://schemas.xmlsoap.org/ws/2005/02/trust"/>
<xsd:import schemaLocation="https://example.com/adfs/services/trust/mex?xsd=xsd2" namespace="http://docs.oasis-open.org/ws-sx/ws-trust/200512"/>
</xsd:schema>
</wsdl:types>
<wsdl:message name="IWSTrustFeb2005Async_TrustFeb2005IssueAsync_InputMessage">
Expand Down Expand Up @@ -835,80 +835,80 @@
</wsdl:binding>
<wsdl:service name="SecurityTokenService">
<wsdl:port name="CustomBinding_IWSTrustFeb2005Async" binding="tns:CustomBinding_IWSTrustFeb2005Async">
<soap12:address location="https://corp.sts.microsoft.com/adfs/services/trust/2005/windowstransport"/>
<soap12:address location="https://example.com/adfs/services/trust/2005/windowstransport"/>
<wsa10:EndpointReference>
<wsa10:Address>https://corp.sts.microsoft.com/adfs/services/trust/2005/windowstransport</wsa10:Address>
<wsa10:Address>https://example.com/adfs/services/trust/2005/windowstransport</wsa10:Address>
<Identity xmlns="http://schemas.xmlsoap.org/ws/2006/02/addressingidentity">
<Upn>iamfed@redmond.corp.microsoft.com</Upn>
<Upn>iamfed@example.com</Upn>
</Identity>
</wsa10:EndpointReference>
</wsdl:port>
<wsdl:port name="CertificateWSTrustBinding_IWSTrustFeb2005Async" binding="tns:CertificateWSTrustBinding_IWSTrustFeb2005Async">
<soap12:address location="https://corp.sts.microsoft.com/adfs/services/trust/2005/certificatemixed"/>
<soap12:address location="https://example.com/adfs/services/trust/2005/certificatemixed"/>
<wsa10:EndpointReference>
<wsa10:Address>https://corp.sts.microsoft.com/adfs/services/trust/2005/certificatemixed</wsa10:Address>
<wsa10:Address>https://example.com/adfs/services/trust/2005/certificatemixed</wsa10:Address>
</wsa10:EndpointReference>
</wsdl:port>
<wsdl:port name="UserNameWSTrustBinding_IWSTrustFeb2005Async" binding="tns:UserNameWSTrustBinding_IWSTrustFeb2005Async">
<soap12:address location="https://corp.sts.microsoft.com/adfs/services/trust/2005/usernamemixed"/>
<soap12:address location="https://example.com/adfs/services/trust/2005/usernamemixed"/>
<wsa10:EndpointReference>
<wsa10:Address>https://corp.sts.microsoft.com/adfs/services/trust/2005/usernamemixed</wsa10:Address>
<wsa10:Address>https://example.com/adfs/services/trust/2005/usernamemixed</wsa10:Address>
</wsa10:EndpointReference>
</wsdl:port>
<wsdl:port name="CustomBinding_IWSTrustFeb2005Async1" binding="tns:CustomBinding_IWSTrustFeb2005Async1">
<soap12:address location="https://corp.sts.microsoft.com/adfs/services/trust/2005/kerberosmixed"/>
<soap12:address location="https://example.com/adfs/services/trust/2005/kerberosmixed"/>
<wsa10:EndpointReference>
<wsa10:Address>https://corp.sts.microsoft.com/adfs/services/trust/2005/kerberosmixed</wsa10:Address>
<wsa10:Address>https://example.com/adfs/services/trust/2005/kerberosmixed</wsa10:Address>
</wsa10:EndpointReference>
</wsdl:port>
<wsdl:port name="IssuedTokenWSTrustBinding_IWSTrustFeb2005Async" binding="tns:IssuedTokenWSTrustBinding_IWSTrustFeb2005Async">
<soap12:address location="https://corp.sts.microsoft.com/adfs/services/trust/2005/issuedtokenmixedasymmetricbasic256"/>
<soap12:address location="https://example.com/adfs/services/trust/2005/issuedtokenmixedasymmetricbasic256"/>
<wsa10:EndpointReference>
<wsa10:Address>https://corp.sts.microsoft.com/adfs/services/trust/2005/issuedtokenmixedasymmetricbasic256</wsa10:Address>
<wsa10:Address>https://example.com/adfs/services/trust/2005/issuedtokenmixedasymmetricbasic256</wsa10:Address>
</wsa10:EndpointReference>
</wsdl:port>
<wsdl:port name="IssuedTokenWSTrustBinding_IWSTrustFeb2005Async1" binding="tns:IssuedTokenWSTrustBinding_IWSTrustFeb2005Async1">
<soap12:address location="https://corp.sts.microsoft.com/adfs/services/trust/2005/issuedtokenmixedsymmetricbasic256"/>
<soap12:address location="https://example.com/adfs/services/trust/2005/issuedtokenmixedsymmetricbasic256"/>
<wsa10:EndpointReference>
<wsa10:Address>https://corp.sts.microsoft.com/adfs/services/trust/2005/issuedtokenmixedsymmetricbasic256</wsa10:Address>
<wsa10:Address>https://example.com/adfs/services/trust/2005/issuedtokenmixedsymmetricbasic256</wsa10:Address>
</wsa10:EndpointReference>
</wsdl:port>
<wsdl:port name="CustomBinding_IWSTrust13Async" binding="tns:CustomBinding_IWSTrust13Async">
<soap12:address location="https://corp.sts.microsoft.com/adfs/services/trust/13/kerberosmixed"/>
<soap12:address location="https://example.com/adfs/services/trust/13/kerberosmixed"/>
<wsa10:EndpointReference>
<wsa10:Address>https://corp.sts.microsoft.com/adfs/services/trust/13/kerberosmixed</wsa10:Address>
<wsa10:Address>https://example.com/adfs/services/trust/13/kerberosmixed</wsa10:Address>
</wsa10:EndpointReference>
</wsdl:port>
<wsdl:port name="CertificateWSTrustBinding_IWSTrust13Async" binding="tns:CertificateWSTrustBinding_IWSTrust13Async">
<soap12:address location="https://corp.sts.microsoft.com/adfs/services/trust/13/certificatemixed"/>
<soap12:address location="https://example.com/adfs/services/trust/13/certificatemixed"/>
<wsa10:EndpointReference>
<wsa10:Address>https://corp.sts.microsoft.com/adfs/services/trust/13/certificatemixed</wsa10:Address>
<wsa10:Address>https://example.com/adfs/services/trust/13/certificatemixed</wsa10:Address>
</wsa10:EndpointReference>
</wsdl:port>
<wsdl:port name="UserNameWSTrustBinding_IWSTrust13Async" binding="tns:UserNameWSTrustBinding_IWSTrust13Async">
<soap12:address location="https://corp.sts.microsoft.com/adfs/services/trust/13/usernamemixed"/>
<soap12:address location="https://example.com/adfs/services/trust/13/usernamemixed"/>
<wsa10:EndpointReference>
<wsa10:Address>https://corp.sts.microsoft.com/adfs/services/trust/13/usernamemixed</wsa10:Address>
<wsa10:Address>https://example.com/adfs/services/trust/13/usernamemixed</wsa10:Address>
</wsa10:EndpointReference>
</wsdl:port>
<wsdl:port name="IssuedTokenWSTrustBinding_IWSTrust13Async" binding="tns:IssuedTokenWSTrustBinding_IWSTrust13Async">
<soap12:address location="https://corp.sts.microsoft.com/adfs/services/trust/13/issuedtokenmixedasymmetricbasic256"/>
<soap12:address location="https://example.com/adfs/services/trust/13/issuedtokenmixedasymmetricbasic256"/>
<wsa10:EndpointReference>
<wsa10:Address>https://corp.sts.microsoft.com/adfs/services/trust/13/issuedtokenmixedasymmetricbasic256</wsa10:Address>
<wsa10:Address>https://example.com/adfs/services/trust/13/issuedtokenmixedasymmetricbasic256</wsa10:Address>
</wsa10:EndpointReference>
</wsdl:port>
<wsdl:port name="IssuedTokenWSTrustBinding_IWSTrust13Async1" binding="tns:IssuedTokenWSTrustBinding_IWSTrust13Async1">
<soap12:address location="https://corp.sts.microsoft.com/adfs/services/trust/13/issuedtokenmixedsymmetricbasic256"/>
<soap12:address location="https://example.com/adfs/services/trust/13/issuedtokenmixedsymmetricbasic256"/>
<wsa10:EndpointReference>
<wsa10:Address>https://corp.sts.microsoft.com/adfs/services/trust/13/issuedtokenmixedsymmetricbasic256</wsa10:Address>
<wsa10:Address>https://example.com/adfs/services/trust/13/issuedtokenmixedsymmetricbasic256</wsa10:Address>
</wsa10:EndpointReference>
</wsdl:port>
<wsdl:port name="CustomBinding_IWSTrust13Async1" binding="tns:CustomBinding_IWSTrust13Async1">
<soap12:address location="https://corp.sts.microsoft.com/adfs/services/trust/13/windowstransport"/>
<soap12:address location="https://example.com/adfs/services/trust/13/windowstransport"/>
<wsa10:EndpointReference>
<wsa10:Address>https://corp.sts.microsoft.com/adfs/services/trust/13/windowstransport</wsa10:Address>
<wsa10:Address>https://example.com/adfs/services/trust/13/windowstransport</wsa10:Address>
<Identity xmlns="http://schemas.xmlsoap.org/ws/2006/02/addressingidentity">
<Upn>iamfed@redmond.corp.microsoft.com</Upn>
<Upn>iamfed@example.com</Upn>
</Identity>
</wsa10:EndpointReference>
</wsdl:port>
Expand Down
3 changes: 1 addition & 2 deletions tests/test_mex.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def _test_parser(self, sample, expected_endpoint):

def test_happy_path_1(self):
self._test_parser("microsoft.mex.xml",
'https://corp.sts.microsoft.com/adfs/services/trust/13/usernamemixed')
'https://example.com/adfs/services/trust/13/usernamemixed')

def test_happy_path_2(self):
self._test_parser('arupela.mex.xml',
Expand All @@ -25,4 +25,3 @@ def test_happy_path_2(self):
def test_happy_path_3(self):
self._test_parser('archan.us.mex.xml',
'https://arvmserver2012.archan.us/adfs/services/trust/13/usernamemixed')

Loading