Skip to content

Commit 9d2763a

Browse files
StoyanGoranovStoyanGoranov
authored
chore: implement full CSP support (#75)
* chore: implement full CSP support *fix: databound EditorTemplates in Overview Grid
1 parent 44035bd commit 9d2763a

24 files changed

+108
-43
lines changed

‎Telerik.Examples.ContentSecurityPolicy/Controllers/Demo_Overview_CSPController.cs‎

Lines changed: 22 additions & 1 deletion
Large diffs are not rendered by default.

‎Telerik.Examples.ContentSecurityPolicy/NuGet.Config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageSources>
4-
<add key="Telerik.UI.for.AspNet.Core.Trial.2023.2.718" value=".\\nuget" />
4+
<add key="Telerik.UI.for.AspNet.Core.Trial.2023.3.1010" value=".\\nuget" />
55
</packageSources>
66
</configuration>

‎Telerik.Examples.ContentSecurityPolicy/Properties/launchSettings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"environmentVariables": {
77
"ASPNETCORE_ENVIRONMENT": "Development"
88
},
9-
"applicationUrl": "https://localhost:52626;http://localhost:52627",
9+
"applicationUrl": "https://localhost:3000;http://localhost:3001",
1010
"hotReloadEnabled": false
1111
}
1212
}

‎Telerik.Examples.ContentSecurityPolicy/Telerik.Examples.ContentSecurityPolicy.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</ItemGroup>
4040

4141
<ItemGroup>
42-
<PackageReference Include="Telerik.UI.for.AspNet.Core.Trial" Version="2023.2.718" />
42+
<PackageReference Include="Telerik.UI.for.AspNet.Core.Trial" Version="2023.3.1010" />
4343
</ItemGroup>
4444

4545
<ProjectExtensions><VisualStudio><UserProperties UseCdnSupport="" /></VisualStudio></ProjectExtensions>

‎Telerik.Examples.ContentSecurityPolicy/Views/Demo_Detail_Template_CSP/Demo_Detail_Template_CSP.cshtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
})
3434
.Events(e=>e.Select("onSelect"))
3535
))
36-
.HtmlAttributes(new { style = "height:430px;" })
36+
.Height(430)
3737
.DataSource(dataSource => dataSource
3838
.Ajax()
3939
.PageSize(5)
@@ -71,7 +71,7 @@
7171
}
7272
</script>
7373

74-
<style>
74+
<style nonce="Telerik-CSP-Examples">
7575
.k-detail-cell .k-tabstrip .demo-section {
7676
padding: 0.2em;
7777
}

‎Telerik.Examples.ContentSecurityPolicy/Views/Demo_Overview_CSP/Demo_Overview_CSP.cshtml‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
}
66
<meta charset="utf-8" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8-
<meta http-equiv="Content-Security-Policy" content="default-src 'self'; img-src 'self'; script-src 'self' https://kendo.cdn.telerik.com https://code.jquery.com/ 'nonce-Telerik-CSP-Examples'; style-src 'self' 'unsafe-inline' https://kendo.cdn.telerik.com; font-src 'self' data:;" />
8+
<meta http-equiv="Content-Security-Policy" content="default-src 'self'; img-src 'self' data:; script-src 'self' https://kendo.cdn.telerik.com https://code.jquery.com/ 'nonce-Telerik-CSP-Examples'; style-src 'self' 'unsafe-inline' https://kendo.cdn.telerik.com; font-src 'self' data:;" />
99
<title>@ViewData["Title"] - Telerik.Examples.Mvc</title>
1010

1111
@{
12-
var kendoVersion = "2023.2.718";
12+
var kendoVersion = "2023.3.1010";
1313
}
14-
<link rel="stylesheet" href="https://kendo.cdn.telerik.com/themes/6.6.0/default/default-ocean-blue.css">
14+
<link rel="stylesheet" href="https://kendo.cdn.telerik.com/themes/7.0.1/default/default-ocean-blue.css">
1515

1616
<script src="https://code.jquery.com/jquery-3.7.0.min.js"
1717
integrity="sha256-2Pmvv0kuTBOenSvLm6bvfBSSHrUJ+3A7x6P5Ebd07/g="
@@ -20,7 +20,7 @@
2020
<script src="https://kendo.cdn.telerik.com/@kendoVersion/js/kendo.all.min.js"></script>
2121
<script src="https://kendo.cdn.telerik.com/@kendoVersion/js/kendo.aspnetmvc.min.js"></script>
2222

23-
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
23+
@*<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />*@
2424
<link rel="stylesheet" href="~/css/site.css" />
2525

2626
@(Html.Kendo().Grid<Telerik.Examples.ContentSecurityPolicy.Models.DetailProductViewModel>()
@@ -31,11 +31,14 @@
3131
columns.Bound(p => p.ProductName)
3232
.ClientTemplate(Html.Kendo().Template().AddHtml(
3333
@"<div class='product-photo'
34-
style='background-image: url(" + @Url.Content("~/shared/foods/${data.ProductID}.jpg") + ");'></div><div class='product-name'>${ data.ProductName }</div>")).Width(300);
35-
columns.Bound(p => p.UnitPrice).Title("Price").Width(105);
34+
style='background-image: url(" + @Url.Content("~/shared/foods/${data.ProductID}.jpg") + ");'></div><div class='product-name'>${ data.ProductName }</div>"))
35+
.EditorTemplateComponentName("String")
36+
.Width(300);
37+
columns.Bound(p => p.UnitPrice).EditorTemplateComponentName("Currency").Title("Price").Width(105);
3638
columns.Bound(p => p.Discontinued).Title("In Stock").Width(130)
3739
.ClientTemplate(Html.Kendo().Template().AddHtml("<span id='badge_${data.ProductID}' class='badgeTemplate'></span>"));
38-
columns.Bound(p => p.Category.CategoryName).Title("Category").EditorTemplateName("ClientCategoryEditor").ClientGroupHeaderTemplateHandler("CategoryTemplateHandler").Width(125);
40+
columns.Bound(p => p.Category).ClientTemplateHandler("CategoryTemplateHandler").Title("Category").EditorTemplateComponentName("ClientCategoryEditor").Width(125);
41+
columns.Bound(p => p.Category.CategoryName).ClientGroupHeaderTemplateHandler("CategoryHeaderTemplateHandler").Hidden();
3942
columns.Bound(p => p.CustomerRating).Title("Rating").Width(140).Editable("returnFalse").ClientTemplate(Html.Kendo().Template().AddComponent(rating => rating.Rating()
4043
.Name("rating_${data.ProductID}")
4144
.Min(1)
@@ -44,11 +47,11 @@
4447
.HtmlAttributes(new { data_bind = "value: CustomerRating" })
4548
.Selection("continuous")
4649
));
47-
columns.Bound(p => p.Country.CountryNameLong).Title("Country").EditorTemplateName("Country").ClientTemplate(Html.Kendo().Template().AddHtml(
50+
columns.Bound(p => p.Country).Title("Country").EditorTemplateComponentName("Country").ClientTemplate(Html.Kendo().Template().AddHtml(
4851
@"<div class='k-text-center'><img src='" + @Url.Content("~/shared/country-flags/${data.Country.CountryNameShort}.png") + "' alt='${ data.Country.CountryNameLong}' title='${ data.Country.CountryNameLong}' width='30' /></div>")).Width(120);
49-
columns.Bound(p => p.UnitsInStock).Title("Units").Width(105);
50-
columns.Bound(p => p.TotalSales).Title("Total Sales").Width(140).Format("{0:c}");
51-
columns.Bound(p => p.TargetSales).Editable("returnFalse").Title("Target Sales")
52+
columns.Bound(p => p.UnitsInStock).EditorTemplateComponentName("Integer").Title("Units").Width(105);
53+
columns.Bound(p => p.TotalSales).Title("Total Sales").Width(140).Format("{0:c}");
54+
columns.Bound(p => p.TargetSales).Editable("returnFalse").Title("Target Sales")
5255
.ClientTemplate(Html.Kendo().Template().AddComponent(sparkline => sparkline.Sparkline()
5356
.Name("chart_${data.ProductID}")
5457
.Legend(legend => legend
@@ -140,8 +143,15 @@
140143
}
141144
}
142145
function CategoryTemplateHandler(data){
146+
return `${data.Category.CategoryName}`;
147+
}
148+
function CategoryHeaderTemplateHandler(data){
149+
143150
return `Category: ${data.value}, Total Sales: ${kendo.format('{0:c}')}, ${data.aggregates.TotalSales.sum}`;
144151
}
152+
function CountryTemplateHandler(data){
153+
return `<div class='dropdown-country-wrap'><img src='@Url.Content("~/shared/country-flags/${data.CountryNameShort}.png")' alt='${data.CountryNameLong}' title='${data.CountryNameLong}' width='20' /><span>${data.CountryNameLong}</span></div>`;
154+
}
145155
function onDataBound(e) {
146156
var grid = this;
147157
var rows = $("tr");

‎Telerik.Examples.ContentSecurityPolicy/Views/Home/Index.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
});
3939
</script>
4040

41-
<style>
41+
<style nonce="Telerik-CSP-Examples">
4242
.nav-list {
4343
display: flex;
4444
flex-wrap: wrap;

‎Telerik.Examples.ContentSecurityPolicy/Views/Shared/EditorTemplates/Boolean.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
@model bool?
22

3-
@(Html.Kendo().CheckBoxFor(m => m).HtmlAttributes(new { title = Html.ViewContext.ViewData.TemplateInfo.GetFullHtmlFieldName("")}))
3+
@(Html.Kendo().CheckBoxFor(m => m).HtmlAttributes(new { title = Html.ViewContext.ViewData.TemplateInfo.GetFullHtmlFieldName("")}))

‎Telerik.Examples.ContentSecurityPolicy/Views/Shared/EditorTemplates/ClientCategoryEditor.cshtml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
@model Telerik.Examples.ContentSecurityPolicy.Models.CategoryViewModel
2+
3+
@(Html.Kendo().Template().AddComponent(x => x.DropDownListFor(m => m)
4+
.DataValueField("CategoryID")
5+
.DataTextField("CategoryName")
6+
.HtmlAttributes(new { data_bind = "value: Category" })
7+
@*.DataSource(dataSource=>dataSource
8+
.Read(read=>read.Action("Read_Categories","Demo_Overview_CSP"))
9+
)*@
10+
.BindTo((System.Collections.IEnumerable) ViewData["categories"])
11+
.HtmlAttributes(new { style = "width:100%" })
12+
.HtmlAttributes(new { title = Html.ViewContext.ViewData.TemplateInfo.GetFullHtmlFieldName("") })
13+
)
14+
)
15+
16+

‎Telerik.Examples.ContentSecurityPolicy/Views/Shared/EditorTemplates/Country.cshtml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
@model string
1+
@model Telerik.Examples.ContentSecurityPolicy.Models.CountryViewModel
22

3-
@(Html.Kendo().DropDownListFor(m => m)
3+
4+
5+
@(Html.Kendo().Template().AddComponent(x => x.DropDownListFor(m => m)
46
.DataValueField("CountryNameShort")
57
.DataTextField("CountryNameLong")
68
.HtmlAttributes(new { data_bind = "value: Country" })
7-
.Template(@"<div class='dropdown-country-wrap'><img src='" + @Url.Content("~/content/web/country-flags/#:data.CountryNameShort#.png") + "' alt='#: data.CountryNameLong#' title='#: data.CountryNameLong#' width='20' /><span>#: data.CountryNameLong #</span></div>")
8-
.BindTo((System.Collections.IEnumerable)ViewData["countries"])
9+
.TemplateHandler("CountryTemplateHandler")
10+
.BindTo((System.Collections.IEnumerable) ViewData["countries"])
911
.AutoWidth(true)
12+
.HtmlAttributes(new { title = Html.ViewContext.ViewData.TemplateInfo.GetFullHtmlFieldName("") }))
1013
)

0 commit comments

Comments
 (0)