Skip to content

Commit 8117911

Browse files
authored
Merge pull request #12 from spassarop/develop
Changes for v1.2.0
2 parents 550e9b7 + c166525 commit 8117911

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+156
-86
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757

5858
# Initializes the CodeQL tools for scanning.
5959
- name: Initialize CodeQL
60-
uses: github/codeql-action/init@v1
60+
uses: github/codeql-action/init@v2
6161
with:
6262
languages: ${{ matrix.language }}
6363
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -66,21 +66,16 @@ jobs:
6666
# queries: ./path/to/local/query, your-org/your-repo/queries@main
6767

6868
# This prevents errors when automatically installing SDK.
69-
# CodeQL does not install .NET 5.0 nor 6.0.
70-
- name: Setup .NET 5.0 SDK+Runtime
69+
# CodeQL does not install .NET 8.0.
70+
- name: Setup .NET 8.0 SDK+Runtime
7171
uses: actions/[email protected]
7272
with:
73-
dotnet-version: 5.0.404
74-
75-
- name: Setup .NET 6.0 SDK+Runtime
76-
uses: actions/[email protected]
77-
with:
78-
dotnet-version: 6.0.101
73+
dotnet-version: 8.0.100
7974

8075
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
8176
# If this step fails, then you should remove it and run the build manually (see below)
8277
- name: Autobuild
83-
uses: github/codeql-action/autobuild@v1
78+
uses: github/codeql-action/autobuild@v2
8479

8580
# ℹ️ Command-line programs to run using the OS shell.
8681
# 📚 https://git.io/JvXDl
@@ -94,4 +89,4 @@ jobs:
9489
# make release
9590

9691
- name: Perform CodeQL Analysis
97-
uses: github/codeql-action/analyze@v1
92+
uses: github/codeql-action/analyze@v2

.github/workflows/netcore_and_netframework.yml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,10 @@ jobs:
4040
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
4141
- uses: actions/checkout@v2
4242

43-
- name: Setup .NET Core SDK+Runtime
43+
- name: Setup .NET 8.0 SDK+Runtime
4444
uses: actions/[email protected]
4545
with:
46-
dotnet-version: 3.1.x
47-
48-
- name: Setup .NET 5.0 SDK+Runtime
49-
uses: actions/[email protected]
50-
with:
51-
dotnet-version: 5.0.404
52-
53-
- name: Setup .NET 6.0 SDK+Runtime
54-
uses: actions/[email protected]
55-
with:
56-
dotnet-version: 6.0.101
46+
dotnet-version: 8.0.100
5747

5848
- name: Setup MSBuild for .NET Framework
5949
uses: microsoft/setup-msbuild@v1

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BSD 3-Clause License
22

3-
Copyright (c) 2022, spassarop
3+
Copyright (c) 2023, spassarop
44
All rights reserved.
55

66
Redistribution and use in source and binary forms, with or without

OWASP.AntiSamy/AntiSamyPolicyExamples/antisamy-anythinggoes.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ http://www.w3.org/TR/html401/struct/global.html
4141

4242
<regexp name="anything" value=".*"/>
4343
<regexp name="numberOrPercent" value="(\d)+(%{0,1})"/>
44-
<regexp name="paragraph" value="([\p{L}\p{N},'\.\s\-_\(\)]|&amp;[0-9]{2};)*"/>
44+
<regexp name="paragraph" value="[\p{L}\p{N},'.\s\-_\(\)&amp;;]*"/>
4545
<regexp name="htmlId" value="[a-zA-Z0-9\:\-_\.]+"/>
4646
<regexp name="htmlTitle" value="[\p{L}\p{N}\s\-_',:\[\]!\./\\\(\)&amp;]*"/> <!-- force non-empty with a '+' at the end instead of '*' -->
4747
<regexp name="htmlClass" value="[a-zA-Z0-9\s,\-_]+"/>

OWASP.AntiSamy/AntiSamyPolicyExamples/antisamy-ebay.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ http://www.w3.org/TR/html401/struct/global.html
3939

4040
<regexp name="anything" value=".*"/>
4141
<regexp name="numberOrPercent" value="(\d)+(%{0,1})"/>
42-
<regexp name="paragraph" value="([\p{L}\p{N},'\.\s\-_\(\)]|&amp;[0-9]{2};)*"/>
42+
<regexp name="paragraph" value="[\p{L}\p{N},'.\s\-_\(\)&amp;;]*"/>
4343
<regexp name="htmlId" value="[a-zA-Z0-9\:\-_\.]+"/>
4444
<regexp name="htmlTitle" value="[\p{L}\p{N}\s\-_',:\[\]!\./\\\(\)&amp;]*"/> <!-- force non-empty with a '+' at the end instead of '*' -->
4545
<regexp name="htmlClass" value="[a-zA-Z0-9\s,\-_]+"/>

OWASP.AntiSamy/AntiSamyPolicyExamples/antisamy-myspace.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ http://www.w3.org/TR/html401/struct/global.html
4141

4242
<regexp name="anything" value=".*"/>
4343
<regexp name="numberOrPercent" value="(\d)+(%{0,1})"/>
44-
<regexp name="paragraph" value="([\p{L}\p{N},'\.\s\-_\(\)]|&amp;[0-9]{2};)*"/>
44+
<regexp name="paragraph" value="[\p{L}\p{N},'.\s\-_\(\)&amp;;]*"/>
4545
<regexp name="htmlId" value="[a-zA-Z0-9\:\-_\.]+"/>
4646
<regexp name="htmlTitle" value="[\p{L}\p{N}\s\-_',:\[\]!\./\\\(\)&amp;]*"/> <!-- force non-empty with a '+' at the end instead of '*' -->
4747
<regexp name="htmlClass" value="[a-zA-Z0-9\s,\-_]+"/>

OWASP.AntiSamy/AntiSamyPolicyExamples/antisamy.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ http://www.w3.org/TR/html401/struct/global.html
4444

4545
<regexp name="anything" value=".*"/>
4646
<regexp name="numberOrPercent" value="(\d)+(%{0,1})"/>
47-
<regexp name="paragraph" value="([\p{L}\p{N},'\.\s\-_\(\)]|&amp;[0-9]{2};)*"/>
47+
<regexp name="paragraph" value="[\p{L}\p{N},'.\s\-_\(\)&amp;;]*"/>
4848
<regexp name="htmlId" value="[a-zA-Z0-9\:\-_\.]+"/>
4949
<regexp name="htmlTitle" value="[\p{L}\p{N}\s\-_',:\[\]!\./\\\(\)&amp;]*"/>
5050
<!-- force non-empty with a '+' at the end instead of '*' -->

OWASP.AntiSamy/Css/CssScanner.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2022, Jerry Hoff, Caner Patir, Sebastián Passaro
2+
* Copyright (c) 2023, Jerry Hoff, Caner Patir, Sebastián Passaro
33
*
44
*
55
* All rights reserved.

OWASP.AntiSamy/Exceptions/ParseException.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2022, Caner Patir, Sebastián Passaro
2+
* Copyright (c) 2023, Caner Patir, Sebastián Passaro
33
*
44
* All rights reserved.
55
*

OWASP.AntiSamy/Exceptions/PolicyException.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2008-2022, Jerry Hoff, Sebastián Passaro
2+
* Copyright (c) 2008-2023, Jerry Hoff, Sebastián Passaro
33
*
44
* All rights reserved.
55
*

0 commit comments

Comments
 (0)