Skip to content
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.

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

CsvReport: escape special characters #245

Merged
merged 1 commit into from
Mar 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,21 @@ class CsvReport(private val projects: List<Model>) : Report {

/** Add elements to Csv. */
private fun MutableList<String?>.addCsvString(element: String): Boolean {
return this.add(element.valueOrNull())
val escaped = element.valueOrNull()
?.replace("\"", "\"\"")
?.let { el ->
when {
el.contains(",") ||
el.contains("\n") ||
el.contains("'") ||
el.contains("\\") ||
el.contains("\"")
-> "\"$el\""

else -> el
}
}
return this.add(escaped)
}

/** Add List of elements to Csv as comma separated list with quotes. */
Expand All @@ -76,13 +90,7 @@ class CsvReport(private val projects: List<Model>) : Report {
): Boolean {
return when {
elements.isEmpty() -> this.add(null)
else -> {
val element = elements.joinToString(separator = ",", transform = transform)
when (elements.size) {
1 -> this.add(element)
else -> this.add("\"${element}\"")
}
}
else -> addCsvString(elements.joinToString(separator = ",", transform = transform))
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,4 +92,37 @@ final class CsvReportSpec extends Specification {
then:
assertCsv(expected, actual)
}

def 'open source csv - escape characters'() {
given:
def developerA = new Developer(id: 'Joe')
def developerB = new Developer(id: '5\" Above Ground')
def developers = [developerA, developerB]
def license = new License(
name: 'Apache, 2.0',
url: 'url'
)
def project = new Model(
name: "Joe's project",
description: 'Copyright "Joe" 2023\n\nAll right reserved\\to me',
licenses: [license],
url: 'url',
developers: developers,
inceptionYear: 'year',
groupId: 'foo',
artifactId: 'bar',
version: '1.2.3',
)
def projects = [project]
def sut = new CsvReport(projects)

when:
def actual = sut.toString()
def expected =
"project,description,version,developers,url,year,licenses,license urls,dependency\n" +
"\"Joe\'s project\",\"Copyright \"\"Joe\"\" 2023\n\nAll right reserved\\to me\",1.2.3,\"Joe,5\"\" Above Ground\",url,year,\"Apache, 2.0\",url,foo:bar:1.2.3"

then:
assertCsv(expected, actual)
}
}