Skip to content

Fix SMW query injection and XSS in ResourceDirectory templates #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tosfos wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix SMW query injection and XSS in ResourceDirectory templates #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Semantic structure, forms and templates for extendable resource annotation and b
* Extension:SemanticMediaWiki
* Extension:PageForms
* Extension:Arrays
* Extension:ParserFunctions (with `$wgPFEnableStringFunctions = true` for template sanitization)
* Extension:PageExchange or Extension:PagePort

# Recommended
Expand Down
6 changes: 3 additions & 3 deletions Template/Resource authors.mediawiki
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
--><div class="resource-card-author"><!--

-->{{#queryformlink: form=Resource query
|link text={{{Resource author|}}}
|Resource query[Resource author]={{{Resource author|}}}
|link text={{#replace:{{#replace:{{{Resource author|}}}|<|&lt;}}|>|&gt;}}
|Resource query[Resource author]={{#replace:{{#replace:{{#replace:{{{Resource author|}}}|]||}}|[||}}|{{!}}||}}
|Resource query[Filter]=Resource author
|_run=1
}}<!--

-->{{#if:{{{Resource author info|}}}
|,&#32;{{{Resource author info|}}}
|,&#32;{{#replace:{{#replace:{{{Resource author info|}}}|<|&lt;}}|>|&gt;}}
}}<!--

--></div></includeonly><noinclude>
Expand Down
14 changes: 7 additions & 7 deletions Template/Resource filter.mediawiki
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
|;
|@@@
|{{#if: {{{@@@|}}}
|[[@@@::{{#replace:{{{@@@|}}}|;|{{!}}{{!}}}}]]
|[[@@@::{{#replace:{{#replace:{{#replace:{{#replace:{{{@@@|}}}|]||}}|[||}}|{{!}}||}}|;|{{!}}{{!}}}}]]
}}
|
}}
Expand All @@ -33,8 +33,8 @@
|
|@@@
|{{#ifeq: @@@|{{{{{{Filter|}}}|}}}||<li>{{#queryformlink: form=Resource query
|link text=@@@
|Resource query[Resource category]=@@@
|link text={{#replace:{{#replace:@@@|<|&lt;}}|>|&gt;}}
|Resource query[Resource category]={{#replace:{{#replace:{{#replace:@@@|]||}}|[||}}|{{!}}||}}
|Resource query[Filter]=Resource category
|_run=1
}}</li>
Expand All @@ -47,8 +47,8 @@
|
|@@@
|{{#ifeq: @@@|{{{{{{Filter|}}}|}}}||<li>{{#queryformlink: form=Resource query
|link text=@@@
|Resource query[Resource keyword]=@@@
|link text={{#replace:{{#replace:@@@|<|&lt;}}|>|&gt;}}
|Resource query[Resource keyword]={{#replace:{{#replace:{{#replace:@@@|]||}}|[||}}|{{!}}||}}
|Resource query[Filter]=Resource keyword
|_run=1
}}</li>
Expand All @@ -65,8 +65,8 @@
|
|@@@
|{{#ifeq: @@@|{{{{{{Filter|}}}|}}}||<li>{{#queryformlink: form=Resource query
|link text=@@@
|Resource query[$$$]=@@@
|link text={{#replace:{{#replace:@@@|<|&lt;}}|>|&gt;}}
|Resource query[$$$]={{#replace:{{#replace:{{#replace:@@@|]||}}|[||}}|{{!}}||}}
|Resource query[Filter]=$$$
|_run=1
}}</li>
Expand Down
14 changes: 7 additions & 7 deletions Template/Resource query result row.mediawiki
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,30 @@
|,
|@@@
|<div class="resource-card-author">{{#queryformlink: form=Resource query
|link text=@@@
|Resource query[Resource author]=@@@
|link text={{#replace:{{#replace:@@@|<|&lt;}}|>|&gt;}}
|Resource query[Resource author]={{#replace:{{#replace:{{#replace:@@@|]||}}|[||}}|{{!}}||}}
|Resource query[Filter]=Resource author
|_run=1
}}</div>
|
}}</div>
<div class="resource-card-source">
<div class="badge badge-light">{{#queryformlink: form=Resource query
|link text={{{Resource type|}}}
|Resource query[Resource type]={{{Resource type|}}}
|link text={{#replace:{{#replace:{{{Resource type|}}}|<|&lt;}}|>|&gt;}}
|Resource query[Resource type]={{#replace:{{#replace:{{#replace:{{{Resource type|}}}|]||}}|[||}}|{{!}}||}}
|Resource query[Filter]=Resource type
|_run=1
}}</div>
<div>{{#queryformlink: form=Resource query
|link text={{{Resource name|}}}
|Resource query[Resource name]={{{Resource name|}}}
|link text={{#replace:{{#replace:{{{Resource name|}}}|<|&lt;}}|>|&gt;}}
|Resource query[Resource name]={{#replace:{{#replace:{{#replace:{{{Resource name|}}}|]||}}|[||}}|{{!}}||}}
|Resource query[Filter]=Resource name
|_run=1
}}</div>
</div>
</div><!--

-->{{{Resource description|}}}<!--
-->{{#replace:{{#replace:{{{Resource description|}}}|<|&lt;}}|>|&gt;}}<!--

-->{{#arraydefine: categories
|{{{Resource category|}}},{{#arrayprint: categories|,}}
Expand Down
14 changes: 7 additions & 7 deletions Template/Resource query.mediawiki
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
|;
|@@@
|{{#if: {{{@@@|}}}
|[[@@@::{{{@@@|}}}]]
|[[@@@::{{#replace:{{#replace:{{#replace:{{{@@@|}}}|]||}}|[||}}|{{!}}||}}]]
}}
|
}}
Expand All @@ -39,8 +39,8 @@
|
|@@@
|{{#ifeq: @@@|{{{{{{Filter|}}}|}}}||<li>{{#queryformlink: form=Resource query
|link text=@@@
|Resource query[Resource category]=@@@
|link text={{#replace:{{#replace:@@@|<|&lt;}}|>|&gt;}}
|Resource query[Resource category]={{#replace:{{#replace:{{#replace:@@@|]||}}|[||}}|{{!}}||}}
|Resource query[Filter]=Resource category
|_run=1
}}</li>
Expand All @@ -53,8 +53,8 @@
|
|@@@
|{{#ifeq: @@@|{{{{{{Filter|}}}|}}}||<li>{{#queryformlink: form=Resource query
|link text=@@@
|Resource query[Resource keyword]=@@@
|link text={{#replace:{{#replace:@@@|<|&lt;}}|>|&gt;}}
|Resource query[Resource keyword]={{#replace:{{#replace:{{#replace:@@@|]||}}|[||}}|{{!}}||}}
|Resource query[Filter]=Resource keyword
|_run=1
}}</li>
Expand All @@ -71,8 +71,8 @@
|
|@@@
|{{#ifeq: @@@|{{{{{{Filter|}}}|}}}||<li>{{#queryformlink: form=Resource query
|link text=@@@
|Resource query[$$$]=@@@
|link text={{#replace:{{#replace:@@@|<|&lt;}}|>|&gt;}}
|Resource query[$$$]={{#replace:{{#replace:{{#replace:@@@|]||}}|[||}}|{{!}}||}}
|Resource query[Filter]=$$$
|_run=1
}}</li>
Expand Down
16 changes: 8 additions & 8 deletions Template/Resource.mediawiki
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
-->[[Category:Resources]]<!--

-->{{#if: {{{Authors|}}}
|<div class="resource-card-authors">by&nbsp;{{{Authors|}}}</div>
|<div class="resource-card-authors">by&nbsp;{{#replace:{{#replace:{{{Authors|}}}|<|&lt;}}|>|&gt;}}</div>
}}<!--

--><div class="resource-card-url plainlinks">{{#switch:{{{Resource link type|}}}
Expand All @@ -35,7 +35,7 @@

-->{{#if: {{{Resource description|}}}
|<div class="resource-card-description">
{{{Resource description|}}}
{{#replace:{{#replace:{{{Resource description|}}}|<|&lt;}}|>|&gt;}}
</div>
}}<!--

Expand All @@ -48,8 +48,8 @@
|<div class="resource-card-row">
<div class="resource-card-row-label">@@@</div>
<div class="resource-card-row-value">{{#queryformlink: form=Resource query
|link text={{{@@@|}}}
|Resource query[@@@]={{{@@@|}}}
|link text={{#replace:{{#replace:{{{@@@|}}}|<|&lt;}}|>|&gt;}}
|Resource query[@@@]={{#replace:{{#replace:{{#replace:{{{@@@|}}}|]||}}|[||}}|{{!}}||}}
|Resource query[Filter]=@@@
|_run=1
}}</div>
Expand All @@ -64,8 +64,8 @@
|;
|$$$
|{{#queryformlink: form=Resource query
|link text=$$$
|Resource query[Resource category]=$$$
|link text={{#replace:{{#replace:$$$|<|&lt;}}|>|&gt;}}
|Resource query[Resource category]={{#replace:{{#replace:{{#replace:$$$|]||}}|[||}}|{{!}}||}}
|Resource query[Filter]=Resource category
|_run=1
}}
Expand All @@ -80,8 +80,8 @@
|;
|$$$
|{{#queryformlink: form=Resource query
|link text=$$$
|Resource query[Resource keyword]=$$$
|link text={{#replace:{{#replace:$$$|<|&lt;}}|>|&gt;}}
|Resource query[Resource keyword]={{#replace:{{#replace:{{#replace:$$$|]||}}|[||}}|{{!}}||}}
|Resource query[Filter]=Resource keyword
|_run=1
}}
Expand Down
3 changes: 2 additions & 1 deletion page-exchange.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,8 @@
"requiredExtensions": [
"SemanticMediaWiki",
"PageForms",
"Arrays"
"Arrays",
"ParserFunctions"
]
}
}
Expand Down