Merge pull request #2195 from jmyersmsft/onPremSwitching

Ignore empty path filters, disable cred provider on hosted, disable config creds on on-prem (M103)

Tasks/Common/nuget-task-common/NuGetConfigHelper.ts

@@ -44,7 +44,9 @@ export class NuGetConfigHelper {
         };
 
         if (this._nugetConfigPath) {
-            tl.cp("-f", this._nugetConfigPath, this.tempNugetConfigPath);
+            // don't use cp as that copies the read-only flag, and tfvc sets that on files
+            let content = fs.readFileSync(this._nugetConfigPath);
+            fs.writeFileSync(this.tempNugetConfigPath, content);
         }
         else {
             // small file, use writeFileSync

Tasks/Common/nuget-task-common/NuGetToolRunner.ts

@@ -6,6 +6,7 @@ import {ToolRunner, IExecOptions, IExecResult} from 'vsts-task-lib/toolrunner';
 import * as auth from "./Authentication"
 import * as os from 'os';
 import * as path from 'path';
+import * as url from 'url';
 
 interface EnvironmentDictionary { [key: string]: string }
 
@@ -50,6 +51,7 @@ function prepareNuGetExeEnvironment(input: EnvironmentDictionary, settings: NuGe
     env['NUGET_CREDENTIAL_PROVIDER_OVERRIDE_DEFAULT'] = 'true';
 
     if (credProviderPath) {
+        tl.debug(`credProviderPath = ${credProviderPath}`);
         env['NUGET_CREDENTIALPROVIDERS_PATH'] = credProviderPath;
     }
 
@@ -155,6 +157,79 @@ export function locateNuGetExe(userNuGetExePath: string): string {
     return toolPath;
 }
 
+function isHosted(): boolean {
+    // not an ideal way to detect hosted, but there isn't a variable for it, and we can't make network calls from here
+    // due to proxy issues.
+    const collectionUri = tl.getVariable("System.TeamFoundationCollectionUri");
+    const parsedCollectionUri = url.parse(collectionUri);
+    return /\.visualstudio\.com$/i.test(parsedCollectionUri.hostname);
+}
+
+// Currently, there is a race condition of some sort that causes nuget to not send credentials sometimes
+// when using the credential provider.
+// Unfortunately, on on-premises TFS, we must use credential provider to override NTLM auth with the build
+// identity's token.
+// Therefore, we are enabling credential provider on on-premises and disabling it on hosted. We allow for test
+// instances by an override variable.
+
+export function isCredentialProviderEnabled(): boolean {
+    // set NuGet.ForceEnableCredentialProvider to "true" to force allowing the credential provider flow, "false"
+    // to force *not* allowing the credential provider flow, or unset/anything else to fall through to the 
+    // hosted environment detection logic
+    const credentialProviderOverrideFlag = tl.getVariable("NuGet.ForceEnableCredentialProvider");
+    if (credentialProviderOverrideFlag === "true") {
+        tl.debug("Credential provider is force-enabled for testing purposes.");
+        return true;
+    }
+
+    if (credentialProviderOverrideFlag === "false") {
+        tl.debug("Credential provider is force-disabled for testing purposes.");
+        return false;
+    }
+
+    if (isHosted()) {
+        tl.debug("Credential provider is disabled on hosted.");
+        return false;
+    }
+    else {
+        tl.debug("Credential provider is enabled.")
+        return true;
+    }
+}
+
+export function isCredentialConfigEnabled(): boolean {
+    // set NuGet.ForceEnableCredentialConfig to "true" to force allowing config-based credential flow, "false"
+    // to force *not* allowing config-based credential flow, or unset/anything else to fall through to the 
+    // hosted environment detection logic
+    const credentialConfigOverrideFlag = tl.getVariable("NuGet.ForceEnableCredentialConfig");
+    if (credentialConfigOverrideFlag === "true") {
+        tl.debug("Credential config is force-enabled for testing purposes.");
+        return true;
+    }
+
+    if (credentialConfigOverrideFlag === "false") {
+        tl.debug("Credential config is force-disabled for testing purposes.");
+        return false;
+    }
+
+    // credentials in config will always fail for on-prem
+    if (!isHosted()) {
+        tl.debug("Credential config is disabled on on-premises TFS.");
+        return false;
+    }
+    else {
+        tl.debug("Credential config is enabled.")
+        return true;
+    }
+}
+
 export function locateCredentialProvider(): string {
-    return locateTool('CredentialProvider.TeamBuild.exe');
-}
+    const credentialProviderLocation = locateTool('CredentialProvider.TeamBuild.exe');
+    if(!credentialProviderLocation) {
+        tl.debug("Credential provider is not present.");
+        return null;
+    }
+
+    return isCredentialProviderEnabled() ? credentialProviderLocation : null;
+}
+

Tasks/Common/nuget-task-common/Utility.ts

@@ -6,7 +6,8 @@ import * as os from 'os';
 
 // Attempts to resolve paths the same way the legacy PowerShell's Find-Files worked
 export function resolveFilterSpec(filterSpec: string, basePath?: string, allowEmptyMatch?: boolean): string[] {
-    let patterns = filterSpec.split(";");
+    // make sure to remove any empty entries, or else we'll accidentally match the current directory.
+    let patterns = filterSpec.split(";").map(x => x.trim()).filter(x => !!x);
     let result = new Set<string>();
 
     patterns.forEach(pattern => {
@@ -23,6 +24,8 @@ export function resolveFilterSpec(filterSpec: string, basePath?: string, allowEm
             pattern = path.resolve(basePath, pattern);
         }
 
+        tl.debug(`pattern: ${pattern}, isNegative: ${isNegative}`);
+
         let thisPatternFiles = resolveWildcardPath(pattern, true);
         thisPatternFiles.forEach(file => {
             if (isNegative) {
@@ -44,10 +47,15 @@ export function resolveFilterSpec(filterSpec: string, basePath?: string, allowEm
 
 export function resolveWildcardPath(pattern: string, allowEmptyWildcardMatch?: boolean): string[] {
     let isWindows = os.platform() === 'win32';
-
+    
     // Resolve files for the specified value or pattern
     var filesList: string[];
-    if (pattern.indexOf('*') == -1 && pattern.indexOf('?') == -1) {
+
+    // empty patterns match nothing (otherwise they will effectively match the current directory)
+    if (!pattern) {
+        filesList = [];
+    }
+    else if (pattern.indexOf('*') == -1 && pattern.indexOf('?') == -1) {
 
         // No pattern found, check literal path to a single file
         tl.checkPath(pattern, 'files');

Tasks/NuGetInstaller/nugetinstaller.ts

@@ -35,7 +35,7 @@ var solution = tl.getPathInput('solution', true, false);
 var filesList = nutil.resolveFilterSpec(solution, tl.getVariable('System.DefaultWorkingDirectory') || process.cwd());
 filesList.forEach(solutionFile => {
     if (!tl.stats(solutionFile).isFile()) {
-        throw new Error(tl.loc('NotARegularFile'));
+        throw new Error(tl.loc('NotARegularFile', solutionFile));
     }
 });
 
@@ -67,7 +67,7 @@ var serviceUri = tl.getEndpointUrl("SYSTEMVSSCONNECTION", false);
 
 //find nuget location to use
 var nuGetPathToUse = ngToolRunner.locateNuGetExe(userNuGetPath);
-var credProviderPath = null;//ngToolRunner.locateCredentialProvider();
+var credProviderPath = ngToolRunner.locateCredentialProvider();
 
 var credProviderDir: string = null;
 if (credProviderPath) {
@@ -123,7 +123,10 @@ locationHelpers.assumeNuGetUriPrefixes(serviceUri)
 
         var configFilePromise = Q<string>(nugetConfigPath);
         var credCleanup = () => { return };
-        if (!credProviderDir || (userNuGetPath && preCredProviderNuGet)) {
+        if (!ngToolRunner.isCredentialConfigEnabled()) {
+            tl.debug("Not configuring credentials in nuget.config");
+        }
+        else if (!credProviderDir || (userNuGetPath && preCredProviderNuGet)) {
             if (nugetConfigPath) {
                 var nuGetConfigHelper = new NuGetConfigHelper(nuGetPathToUse, nugetConfigPath, authInfo, environmentSettings);
                 configFilePromise = nuGetConfigHelper.getSourcesFromConfig()

Tasks/NuGetInstaller/task.json

@@ -9,7 +9,7 @@
     "version": {
         "Major": 0,
         "Minor": 2,
-        "Patch": 6
+        "Patch": 7
     },
     "minimumAgentVersion": "1.83.0",
     "groups": [

Tasks/NuGetInstaller/task.loc.json

@@ -9,7 +9,7 @@
   "version": {
     "Major": 0,
     "Minor": 2,
-    "Patch": 6
+    "Patch": 7
   },
   "minimumAgentVersion": "1.83.0",
   "groups": [

Tasks/NugetPublisher/nugetpublisher.ts

@@ -36,7 +36,7 @@ var searchPattern = tl.getPathInput('searchPattern', true, false);
 var filesList = nutil.resolveFilterSpec(searchPattern, tl.getVariable('System.DefaultWorkingDirectory') || process.cwd());
 filesList.forEach(packageFile => {
     if (!tl.stats(packageFile).isFile()) {
-        throw new Error(tl.loc('NotARegularFile'));
+        throw new Error(tl.loc('NotARegularFile', packageFile));
     }
 });
 
@@ -64,7 +64,7 @@ var serviceUri = tl.getEndpointUrl("SYSTEMVSSCONNECTION", false);
 
 //find nuget location to use
 var nuGetPathToUse = ngToolRunner.locateNuGetExe(userNuGetPath);
-var credProviderPath = null;//ngToolRunner.locateCredentialProvider();
+var credProviderPath = ngToolRunner.locateCredentialProvider();
 
 var credProviderDir: string = null;
 if (credProviderPath) {
@@ -123,7 +123,10 @@ locationHelpers.assumeNuGetUriPrefixes(serviceUri)
         var feedUri: string;
         var credCleanup = () => { return };
         if (nuGetFeedType == "internal") {
-            if (!credProviderDir || (userNuGetPath && preCredProviderNuGet)) {
+            if (!ngToolRunner.isCredentialConfigEnabled()) {
+                tl.debug("Not configuring credentials in nuget.config");
+            }
+            else if (!credProviderDir || (userNuGetPath && preCredProviderNuGet)) {
                 var nuGetConfigHelper = new NuGetConfigHelper(nuGetPathToUse, null, authInfo, environmentSettings);
                 nuGetConfigHelper.setSources([{ feedName: "internalFeed", feedUri: internalFeedUri }]);
                 configFilePromise = Q(nuGetConfigHelper.tempNugetConfigPath);

Tasks/NugetPublisher/task.json

@@ -9,7 +9,7 @@
     "version": {
         "Major": 0,
         "Minor": 2,
-        "Patch": 6
+        "Patch": 7
     },
     "demands": [
         "Cmd"

Tasks/NugetPublisher/task.loc.json

@@ -9,7 +9,7 @@
   "version": {
     "Major": 0,
     "Minor": 2,
-    "Patch": 6
+    "Patch": 7
   },
   "demands": [
     "Cmd"

definitions/nuget-task-common.d.ts

@@ -107,6 +107,8 @@ declare module 'nuget-task-common/NuGetToolRunner' {
 	}
 	export function createNuGetToolRunner(nuGetExePath: string, settings: NuGetEnvironmentSettings): NuGetToolRunner;
 	export function locateNuGetExe(userNuGetExePath: string): string;
+	export function isCredentialProviderEnabled(): boolean;
+	export function isCredentialConfigEnabled(): boolean;
 	export function locateCredentialProvider(): string;
 
 }
@@ -123,6 +125,7 @@ declare module 'nuget-task-common/NuGetConfigHelper' {
 	    private _nugetConfigPath;
 	    private _authInfo;
 	    private _environmentSettings;
+	    private tempNugetConfigBaseDir;
 	    private tempNugetConfigDir;
 	    private tempNugetConfigFileName;
 	    tempNugetConfigPath: string;