Skip to content
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
6 changes: 5 additions & 1 deletion diff/src/main/scala/proteus/diff/Git.scala
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@ object Git {
* Extracts all files at the given ref into a temp dir via a `git archive | tar -x` pipeline.
* Much faster than invoking `git show` per file (one subprocess pair vs N+1).
*/
def extractProtos(ref: String, cwd: Option[Path] = None): Either[String, Path] = {
def extractProtos(ref: String, cwd: Option[Path] = None): Either[String, Path] =
if (ref.startsWith("-")) Left(s"invalid git ref: $ref")
else extractProtosUnchecked(ref, cwd)

private def extractProtosUnchecked(ref: String, cwd: Option[Path]): Either[String, Path] = {
val tmp = Files.createTempDirectory("proteus-diff-git-")
sys.addShutdownHook(deleteRecursively(tmp))

Expand Down
10 changes: 10 additions & 0 deletions diff/src/test/scala/proteus/diff/GitSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,16 @@ object GitSpec extends ZIOSpecDefault {
Git.extractProtos("definitely-not-a-ref-12345", Some(dir)).isLeft
}
assertTrue(isLeft)
},
test("extractProtos rejects a ref that looks like a git option") {
val (fileWritten, isLeft) = withRepo { dir =>
writeFile(dir.resolve("a.proto"), """syntax = "proto3"; message Foo {}""")
commit(dir, "initial")
val evil = dir.resolve("evil.tar")
val result = Git.extractProtos(s"--output=${evil.toString}", Some(dir))
(Files.exists(evil), result.isLeft)
}
assertTrue(isLeft, !fileWritten)
}
)
}