Merge branch 'release-1.3.0'

Author: Jonathan Holvey

README.md

@@ -21,6 +21,8 @@ You will be prompted to enter your username and password, which are used to requ
 
 A username and password can also be provided as arguments of the `connect` function, if prompts are not desirable.
 
+The default authentication URL is `login.microsoftonline.com`. If another top level domain is required for a region-specific account, it can be specified using the `auth_tld` argument.
+
 ## Make an API call:
 
 ```python
@@ -70,7 +72,7 @@ The default file name for saving and loading sessions is `sp-session.pkl`, howev
 
 ## Licence
 
-This software is distributed under the GNU General Public License v3. Copyright 2016-2017 Jonathan Holvey.
+This software is distributed under the GNU General Public License v3. Copyright 2016-2018 Jonathan Holvey.
 
 ## Credits
 

session.py

@@ -10,12 +10,14 @@
 # XML namespace URLs
 ns = {
     "wsse": "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd",
-    "d": "http://schemas.microsoft.com/ado/2007/08/dataservices"
+    "psf": "http://schemas.microsoft.com/Passport/SoapServices/SOAPFault",
+    "d": "http://schemas.microsoft.com/ado/2007/08/dataservices",
+    "S": "http://www.w3.org/2003/05/soap-envelope"
 }
 
 
-def connect(site, username=None, password=None):
-    return SharePointSession(site, username, password)
+def connect(site, username=None, password=None, auth_tld=None):
+    return SharePointSession(site, username, password, auth_tld)
 
 
 def load(filename="sp-session.pkl"):
@@ -45,11 +47,12 @@ class SharePointSession(requests.Session):
       <Response [200]>
     """
 
-    def __init__(self, site=None, username=None, password=None):
+    def __init__(self, site=None, username=None, password=None, auth_tld=None):
         super().__init__()
 
         if site is not None:
             self.site = re.sub(r"^https?://", "", site)
+            self.auth_tld = auth_tld or "com"
             self.expire = datetime.now()
             # Request credentials from user
             self.username = username or input("Enter your username: ")
@@ -76,19 +79,31 @@ def _spauth(self):
 
         # Request security token from Microsoft Online
         print("Requesting security token...\r", end="")
-        response = requests.post("https://login.microsoftonline.com/extSTS.srf", data=saml)
+        auth_domain = "login.microsoftonline." + self.auth_tld
+        try:
+            response = requests.post("https://{}/extSTS.srf".format(auth_domain), data=saml)
+        except requests.exceptions.ConnectionError:
+            print("Could not connect to", auth_domain)
+            return
         # Parse and extract token from returned XML
         try:
             root = et.fromstring(response.text)
-            token = root.find(".//wsse:BinarySecurityToken", ns).text
-        except:
-            print("Token request failed. Check your username and password")
+        except et.ParseError:
+            print("Token request failed. The server did not send a valid response")
+            return
+
+        # Extract token from returned XML
+        token = root.find(".//wsse:BinarySecurityToken", ns)
+        # Check for errors and print error messages
+        if token is None or root.find(".//S:Fault", ns) is not None:
+            print("{}: {}".format(root.find(".//S:Text", ns).text,
+                                  root.find(".//psf:text", ns).text).strip().strip("."))
             return
 
         # Request access token from sharepoint site
         print("Requesting access cookie... \r", end="")
         response = requests.post("https://" + self.site + "/_forms/default.aspx?wa=wsignin1.0",
-                                 data=token, headers={"Host": self.site})
+                                 data=token.text, headers={"Host": self.site})
 
         # Create access cookie from returned headers
         cookie = self._buildcookie(response.cookies)
@@ -139,7 +154,7 @@ def post(self, url, *args, **kwargs):
     def getfile(self, url, *args, **kwargs):
         """Stream download of specified URL and output to file"""
         # Extract file name from request URL if not provided as keyword argument
-        filename = kwargs.pop("filename", re.search("[^\/]+$", url).group(0))
+        filename = kwargs.pop("filename", re.search(r"[^/]+$", url).group(0))
         kwargs["stream"] = True
         # Request file in stream mode
         response = self.get(url, *args, **kwargs)