Skip to content

Fix/escape space name description #459

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

Merged
lmarini merged 5 commits into from
Jul 28, 2025
Merged

Fix/escape space name description #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9de47ad
Ranaming `master` branch to `main`.
lmarini Nov 13, 2023
d797540
Escape space name and description to avoid xss.
lmarini Apr 17, 2025
39261e3
Comment out irods dependency as it is not available anymore.
lmarini Apr 18, 2025
89950c7
Upgrade actions/cache from v1 to v3
lmarini Apr 18, 2025
74337d9
Merge branch 'releasse/v1.23.0' into fix/escape-space-name-description
lmarini Jul 28, 2025
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
3 changes: 2 additions & 1 deletion app/controllers/Spaces.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import org.joda.time.DateTime
import play.api.data.Forms._
import play.api.data.{Form, Forms}
import play.api.i18n.Messages
import play.api.templates.HtmlFormat
import play.api.{Logger, Play}
import securesocial.core.providers.{Token, UsernamePasswordProvider}
import services._
Expand Down Expand Up @@ -411,7 +412,7 @@ class Spaces @Inject() (spaces: SpaceService, users: UserService, events: EventS
formData => {
if (Permission.checkPermission(user, Permission.CreateSpace)) {
Logger.debug("Creating space " + formData.name)
val newSpace = ProjectSpace(name = formData.name, description = formData.description,
val newSpace = ProjectSpace(name = HtmlFormat.escape(formData.name).toString(), description = HtmlFormat.escape(formData.description).toString(),
created = new Date, creator = userId, homePage = formData.homePage,
logoURL = formData.logoURL, bannerURL = formData.bannerURL,
collectionCount = 0, datasetCount = 0, fileCount = 0, userCount = 0, spaceBytes = 0, metadata = List.empty,
Expand Down
2 changes: 1 addition & 1 deletion app/views/spaces/listItem.scala.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ <h3><a href="@routes.Spaces.getSpace(space.id)">@space.name</a></h3>

<div class= "row">
<div class="col-md-6 col-sm-6 col-lg-6">
<div class = 'abstractsummary'>@Html(space.description.replace("\n","<br>"))</div>
<div class = 'abstractsummary'>space.description.replace("\n","<br>")</div>
<div>@space.created.format("MMM dd, yyyy")</div>
<div>
<span class="glyphicon glyphicon-briefcase" title="@space.datasetCount datasets"></span> @space.datasetCount
Expand Down
2 changes: 1 addition & 1 deletion app/views/spaces/newEditTemplate.scala.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<ol class="breadcrumb">
@(spaceId, spaceName) match {
case (Some(s), Some(name)) => {
<li> <span class="glyphicon glyphicon-hdd"></span> <a href="@routes.Spaces.getSpace(s)" title="@name"> @Html(ellipsize(name, 18))</a></li>
<li> <span class="glyphicon glyphicon-hdd"></span> <a href="@routes.Spaces.getSpace(s)" title="@name"> @name</a></li>
<li> <span class="glyphicon glyphicon-edit"></span> @Html(title)</li>
}
case (_,_) => {
Expand Down
2 changes: 1 addition & 1 deletion app/views/spaces/space.scala.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<h1 id="spacenamedisplay" class="space-title"><span class="glyphicon glyphicon-hdd"></span> @space.name</h1>
</div>
<div class="col-md-12">
<p><span id="spacedescdisplay" class='abstract'>@Html(space.description.replace("\n","<br>"))</span></p>
<p><span id="spacedescdisplay" class='abstract'>@space.description.replace("\n","<br>")</span></p>
</div>
@if(user.isDefined) {
<div class="col-xs-12">
Expand Down
2 changes: 1 addition & 1 deletion app/views/spaces/tile.scala.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
}
<div class="caption break-word">
<h4 class="no-overflow oneline"><a href="@routes.Spaces.getSpace(space.id)">@space.name</a></h4>
<p class = 'abstractsummary'>@Html(space.description.replace("\n","<br>"))</p>
<p class = 'abstractsummary'>@space.description.replace("\n","<br>")</p>
</div>
</div>
<!-- Space Info -->
Expand Down
Loading