Finish code removal for CVE-2017-16355 fix

phusion · Nov 27, 2017 · 947af42 · 947af42
1 parent 9dadcf3
commit 947af42
Showing 1 changed file with 0 additions and 45 deletions.
diff --git a/src/agent/Core/SpawningKit/Spawner.h b/src/agent/Core/SpawningKit/Spawner.h
@@ -774,51 +774,6 @@ class Spawner {
 		assert(info.appRootPathsInsideChroot.back() == info.appRootInsideChroot);
 	}
 
-#ifdef false
-	void inferApplicationInfo(SpawnPreparationInfo &info) const {
-		info.codeRevision = readFromRevisionFile(info);
-		if (info.codeRevision.empty()) {
-			info.codeRevision = inferCodeRevisionFromCapistranoSymlink(info);
-		}
-	}
-
-	string readFromRevisionFile(const SpawnPreparationInfo &info) const {
-		string filename = info.appRoot + "/REVISION";
-		try {
-			if (fileExists(filename)) {
-				return strip(readAll(filename));
-			}
-		} catch (const SystemException &e) {
-			P_WARN("Cannot access " << filename << ": " << e.what());
-		}
-		return string();
-	}
-
-	string inferCodeRevisionFromCapistranoSymlink(const SpawnPreparationInfo &info) const {
-		if (extractBaseName(info.appRoot) == "current") {
-			char buf[PATH_MAX + 1];
-			ssize_t ret;
-
-			do {
-				ret = readlink(info.appRoot.c_str(), buf, PATH_MAX);
-			} while (ret == -1 && errno == EINTR);
-			if (ret == -1) {
-				if (errno == EINVAL) {
-					return string();
-				} else {
-					int e = errno;
-					P_WARN("Cannot read symlink " << info.appRoot << ": " << strerror(e));
-				}
-			}
-
-			buf[ret] = '\0';
-			return extractBaseName(buf);
-		} else {
-			return string();
-		}
-	}
-#endif
-
 	bool shouldLoadShellEnvvars(const Options &options, const SpawnPreparationInfo &preparation) const {
 		if (options.loadShellEnvvars) {
 			string shellName = extractBaseName(preparation.userSwitching.shell);