Simplifying URI parsing

mathewc · mathewc · commit 3ff8d64274cf · 2016-08-30T17:41:08.000-07:00
diff --git a/src/WebJobs.Script/Binding/Http/HttpTriggerAttributeBindingProvider.cs b/src/WebJobs.Script/Binding/Http/HttpTriggerAttributeBindingProvider.cs
@@ -129,12 +129,9 @@ public async Task<ITriggerData> BindAsync(object value, ValueBindingContext cont
 
             public static string ToInvokeString(HttpRequestMessage request)
             {
-                string uri = request.RequestUri.AbsoluteUri;
-                int idx = uri.IndexOf('?');
-                if (idx != -1)
-                {
-                    uri = uri.Substring(0, idx);
-                }
+                // For display in the Dashboard, we want to be sure we don't log
+                // any sensitive portions of the URI (e.g. query params, headers, etc.)
+                string uri = request.RequestUri?.GetLeftPart(UriPartial.Path);
 
                 return $"Method: {request.Method}, Uri: {uri}";
             }

Original file line number	Diff line number	Diff line change
`@@ -129,12 +129,9 @@ public async Task<ITriggerData> BindAsync(object value, ValueBindingContext cont`
`129`	`129`
`130`	`130`	`public static string ToInvokeString(HttpRequestMessage request)`
`131`	`131`	`{`
`132`		`- string uri = request.RequestUri.AbsoluteUri;`
`133`		`- int idx = uri.IndexOf('?');`
`134`		`- if (idx != -1)`
`135`		`- {`
`136`		`- uri = uri.Substring(0, idx);`
`137`		`- }`
	`132`	`+ // For display in the Dashboard, we want to be sure we don't log`
	`133`	`+ // any sensitive portions of the URI (e.g. query params, headers, etc.)`
	`134`	`+ string uri = request.RequestUri?.GetLeftPart(UriPartial.Path);`
`138`	`135`
`139`	`136`	`return $"Method: {request.Method}, Uri: {uri}";`
`140`	`137`	`}`