Bitbucket Server Support: Added ability to set 'bitbucket' as the provier for an arbitrary host, i.e. a Bitbucket Server host

Allow HTTP as well as HTTPS for Bitbucket Server hosts

TODO test more complex URLs e.g. https://my.company.com/bitbucket

Author: mminns

docs/configuration.md

@@ -62,6 +62,7 @@ ID|Provider
 `auto` _(default)_|_\[automatic\]_
 `azure-repos`|Azure Repos
 `github`|GitHub
+`bitbucket`|Bitbucket
 `generic`|Generic (any other provider not listed above)
 
 Automatic provider selection is based on the remote URL.
@@ -91,6 +92,7 @@ Authority|Provider(s)
 `auto` _(default)_|_\[automatic\]_
 `msa`, `microsoft`, `microsoftaccount`,<br/>`aad`, `azure`, `azuredirectory`,</br>`live`, `liveconnect`, `liveid`|Azure Repos<br/>_(supports Microsoft Authentication)_
 `github`|GitHub<br/>_(supports GitHub Authentication)_
+`bitbucket`|Bitbucket.org<br/>_(supports Basic Authentication and OAuth)_<br/>Bitbucket Server<br/>_(supports Basic Authentication)_
 `basic`, `integrated`, `windows`, `kerberos`, `ntlm`,<br/>`tfs`, `sso`|Generic<br/>_(supports Basic and Windows Integrated Authentication)_
 
 #### Example

src/shared/Atlassian.Bitbucket/BitbucketHostProvider.cs

@@ -51,15 +51,16 @@ public bool IsSupported(InputArguments input)
 
         public async Task<ICredential> GetCredentialAsync(InputArguments input)
         {
+            // Compute the target URI
+            Uri targetUri = GetTargetUri(input);
+
             // We should not allow unencrypted communication and should inform the user
-            if (StringComparer.OrdinalIgnoreCase.Equals(input.Protocol, "http"))
+            if (StringComparer.OrdinalIgnoreCase.Equals(input.Protocol, "http")
+                && targetUri.Host.Equals(BitbucketConstants.BitbucketBaseUrlHost))
             {
                 throw new Exception("Unencrypted HTTP is not supported for Bitbucket. Ensure the repository remote URL is using HTTPS.");
             }
 
-            // Compute the target URI
-            Uri targetUri = GetTargetUri(input);
-
             // Try and get the username specified in the remote URL if any
             string targetUriUser = targetUri.GetUserName();
 
@@ -93,7 +94,7 @@ public async Task<ICredential> GetCredentialAsync(InputArguments input)
                 // or we have a freshly captured user/pass. Regardless, we must check if these credentials
                 // pass and two-factor requirement on the account.
                 _context.Trace.WriteLine("Checking if two-factor requirements for stored credentials...");
-                bool requires2Fa = await RequiresTwoFactorAuthenticationAsync(credential);
+                bool requires2Fa = await RequiresTwoFactorAuthenticationAsync(credential, targetUri);
                 if (!requires2Fa)
                 {
                     _context.Trace.WriteLine("Two-factor requirement passed with stored credentials");
@@ -220,8 +221,14 @@ private async Task<string> ResolveOAuthUserNameAsync(string accessToken)
             throw new Exception($"Failed to resolve username. HTTP: {result.StatusCode}");
         }
 
-        private async Task<bool> RequiresTwoFactorAuthenticationAsync(ICredential credentials)
+        private async Task<bool> RequiresTwoFactorAuthenticationAsync(ICredential credentials, Uri targetUri)
         {
+            if(!targetUri.Host.Equals(BitbucketConstants.BitbucketBaseUrlHost))
+            {
+                // BBS
+                return false;
+            }
+
             RestApiResult<UserInfo> result = await _bitbucketApi.GetUserInformationAsync(credentials.UserName, credentials.Password, false);
             switch (result.StatusCode)
             {