Merge pull request #84 from jameshilliard/validate-unshare-name

tomix26 · web-flow · commit da6e2e68e925 · 2022-05-22T20:11:03.000+02:00
ensure unshare user has a valid name
diff --git a/src/main/java/io/zonky/test/db/postgres/util/LinuxUtils.java b/src/main/java/io/zonky/test/db/postgres/util/LinuxUtils.java
@@ -115,7 +115,12 @@ private static boolean unshareAvailable() {
 
             try (BufferedReader outputReader = new BufferedReader(new InputStreamReader(process.getInputStream(), UTF_8))) {
                 if (process.exitValue() == 0 && !"0".equals(outputReader.readLine())) {
-                    return true;
+                    builder.command("unshare", "-U", "id", "-un");
+                    Process nameprocess = builder.start();
+                    nameprocess.waitFor();
+                    if (nameprocess.exitValue() == 0) {
+                        return true;
+                    }
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,12 @@ private static boolean unshareAvailable() {`
`115`	`115`
`116`	`116`	`try (BufferedReader outputReader = new BufferedReader(new InputStreamReader(process.getInputStream(), UTF_8))) {`
`117`	`117`	`if (process.exitValue() == 0 && !"0".equals(outputReader.readLine())) {`
`118`		`- return true;`
	`118`	`+ builder.command("unshare", "-U", "id", "-un");`
	`119`	`+ Process nameprocess = builder.start();`
	`120`	`+ nameprocess.waitFor();`
	`121`	`+ if (nameprocess.exitValue() == 0) {`
	`122`	`+ return true;`
	`123`	`+ }`
`119`	`124`	`}`
`120`	`125`	`}`
`121`	`126`