b60

Windows obfs proxy,
RedHat obfs proxy

safejumper/osspecific.cpp

@@ -1185,9 +1185,20 @@ void OsSpecific::RunObfs(const QString & srv, const QString & port, const QStrin
 #ifndef Q_OS_WIN
 //	"/usr/local/bin/obfsproxy obfs2 socks 127.0.0.1:1050"
 
+#ifndef Q_OS_REDHAT
 	"/usr/local/bin/obfsproxy "
-//	"--log-min-severity debug --no-safe-logging"
-	" --data-dir /tmp "
+#else
+	"/usr/bin/obfsproxy "
+#endif
+#else		// Win
+	"cmd /k c:\\python27\\Scripts\\obfsproxy.exe "
+//	"c:\\python27\\Scripts\\obfsproxy.exe "
+#endif
+//	"--log-min-severity debug --no-safe-logging "
+#ifndef Q_OS_WIN
+	"--data-dir /tmp "
+#else
+#endif
 	"obfs2 "
 	"--dest "
 //	"185.47.202.158"
@@ -1198,9 +1209,6 @@ void OsSpecific::RunObfs(const QString & srv, const QString & port, const QStrin
 	"127.0.0.1:"
 	+ local_port
 //	"1050"
-#else		// Win
-	""
-#endif
 	;
 
 	if (!IsObfsRunning())
@@ -1216,9 +1224,18 @@ void OsSpecific::InstallObfs()
 {
 	log::logt("InstallObfs() in");
 #ifdef Q_OS_LINUX
+
+#ifndef Q_OS_REDHAT
+	// debian/ubuntu
 	ExecAsRoot("apt-get", QStringList() << "update");
 	ExecAsRoot("apt-get", QStringList() << "install" << "-y"<<"--force-yes" <<"libdpkg-perl=1.17.5ubuntu5");
 	ExecAsRoot("apt-get", QStringList() << "install" << "-y" << "python2.7" <<"python-pip" << "python-dev" << "build-essential");
+#else
+	// CentOS
+	ExecAsRoot("yum",  QStringList() <<  "-y" << "install" << "python-devel");
+	ExecAsRoot("/usr/bin/curl",  QStringList() <<  "https://bootstrap.pypa.io/get-pip.py" << "-o" << "/tmp/get-pip.py");
+	ExecAsRoot("python",  QStringList() <<  "/tmp/get-pip.py");
+#endif
 	ExecAsRoot("pip",  QStringList() << "install" << "obfsproxy");
 #else
 #ifdef Q_OS_MAC
@@ -1268,12 +1285,18 @@ bool OsSpecific::IsObfsInstalled()
 bool OsSpecific::IsObfsRunning()
 {
 	bool b = false;
-//	if (_obfs.get() != NULL)
+#ifdef Q_OS_WIN
+	if (_obfs.get() != NULL)
+	{
+		b = true;		// TODO: -1 actual check
+	}
+#else
 	{
 		QString s1 = RunFastCmd("ps ax");
 		bool b1 = s1.contains("/obfsproxy");
 		b |= b1;
 	}
+#endif
 	return b;
 }
 

safejumper/safejumper.pro

@@ -24,6 +24,7 @@ macx: {
 }
 
 #	DEFINES += MONITOR_TOOL
+#	DEFINES += Q_OS_REDHAT
 
 win32: {
 	WINSDK_DIR = C:/Program Files/Microsoft SDKs/Windows/v7.1A

safejumper/version.h

@@ -1,7 +1,7 @@
 #ifndef VERSION_H
 #define VERSION_H
 
-#define SJ_BUILD_NUM 56
+#define SJ_BUILD_NUM 60
 #define SJ_VERSION "3.0 alpha"
 
 #endif // VERSION_H

win-files/32/proxysh.crt

@@ -0,0 +1,37 @@
+-----BEGIN CERTIFICATE-----
+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
+TSMSym4Np+AmT7OX
+-----END CERTIFICATE-----