April 2014 - tor-commits - lists.torproject.org

[tor-launcher/master] Bug #9665: Report error if no bridges are usable.
by brade＠torproject.org 07 Apr '14

07 Apr '14

commit 61ff5d51649158dc07353e2034473ba6287bdfe0 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Apr 7 16:46:22 2014 -0400 Bug #9665: Report error if no bridges are usable. --- src/chrome/locale/en/torlauncher.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index a2550db..d04cac5 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/… [View More]

1 0

[orbot/master] fix ant build script and target
by n8fr8＠torproject.org 07 Apr '14

07 Apr '14

commit 6bce7d579d286c5d8579c0646fbd3a1bd4ca4bec Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Apr 7 12:17:23 2014 -0400 fix ant build script and target --- AndroidManifest.xml | 4 ++-- update-ant-build.sh | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2b50fef..b80ffc7 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> &… [View More]

1 0

[orbot/master] add new library for superuser/shell commands
by n8fr8＠torproject.org 07 Apr '14

07 Apr '14

commit b734c6c23299e039f9cadf703e4d37341d471b5a Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Apr 7 11:10:19 2014 -0400 add new library for superuser/shell commands --- .gitmodules | 3 +++ external/superuser-commands | 1 + project.properties | 1 + 3 files changed, 5 insertions(+) diff --git a/.gitmodules b/.gitmodules index 1aa60c3..1c98c01 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,3 +22,6 @@ [submodule "external/obfsclient"]… [View More]

1 0

[orbot/master] improve shell command, root and permissions handling
by n8fr8＠torproject.org 07 Apr '14

07 Apr '14

commit e5b70ba4ab02cecf462d84ad7437e7b51ee7f575 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Apr 7 11:10:31 2014 -0400 improve shell command, root and permissions handling --- src/org/torproject/android/service/Root.java | 107 ------------- src/org/torproject/android/service/TorService.java | 125 ++++++++------- .../android/service/TorServiceConstants.java | 5 +- .../android/service/TorServiceUtils.java | 3 +- .../torproject/android/… [View More]service/TorTransProxy.java | 162 ++++++++++---------- .../android/settings/SettingsPreferences.java | 19 +-- src/org/torproject/android/wizard/Permissions.java | 77 +++------- 7 files changed, 169 insertions(+), 329 deletions(-) diff --git a/src/org/torproject/android/service/Root.java b/src/org/torproject/android/service/Root.java deleted file mode 100644 index d41b48c..0000000 --- a/src/org/torproject/android/service/Root.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.torproject.android.service; - -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.File; -import java.io.InputStreamReader; -import java.io.OutputStreamWriter; -import java.util.ArrayList; - -import org.torproject.android.service.ExecShell.SHELL_CMD; - -import android.util.Log; - -/** - * @author Kevin Kowalewski - * - */ -public class Root { - - private static String LOG_TAG = Root.class.getName(); - - public boolean isDeviceRooted() { - if (checkRootMethod1()){return true;} - if (checkRootMethod2()){return true;} - if (checkRootMethod3()){return true;} - return false; - } - - public boolean checkRootMethod1(){ - String buildTags = android.os.Build.TAGS; - - if (buildTags != null && buildTags.contains("test-keys")) { - return true; - } - return false; - } - - public boolean checkRootMethod2(){ - try { - File file = new File("/system/app/Superuser.apk"); - if (file.exists()) { - return true; - } - } catch (Exception e) { } - - return false; - } - - public boolean checkRootMethod3() { - if (new ExecShell().executeCommand(SHELL_CMD.check_su_binary) != null){ - return true; - }else{ - return false; - } - } -} - - -/** - * @author Kevin Kowalewski - * - */ -class ExecShell { - - private static String LOG_TAG = ExecShell.class.getName(); - - public static enum SHELL_CMD { - check_su_binary(new String[] {"/system/xbin/which","su"}), - ; - - String[] command; - - SHELL_CMD(String[] command){ - this.command = command; - } - } - - public ArrayList<String> executeCommand(SHELL_CMD shellCmd){ - String line = null; - ArrayList<String> fullResponse = new ArrayList<String>(); - Process localProcess = null; - - try { - localProcess = Runtime.getRuntime().exec(shellCmd.command); - } catch (Exception e) { - return null; - //e.printStackTrace(); - } - - BufferedWriter out = new BufferedWriter(new OutputStreamWriter(localProcess.getOutputStream())); - BufferedReader in = new BufferedReader(new InputStreamReader(localProcess.getInputStream())); - - try { - while ((line = in.readLine()) != null) { - Log.d(LOG_TAG, "--> Line received: " + line); - fullResponse.add(line); - } - } catch (Exception e) { - e.printStackTrace(); - } - - Log.d(LOG_TAG, "--> Full response was: " + fullResponse); - - return fullResponse; - } - -} \ No newline at end of file diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 55e2a7f..1cede61 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -25,6 +25,10 @@ import net.freehaven.tor.control.ConfigEntry; import net.freehaven.tor.control.EventHandler; import net.freehaven.tor.control.TorControlConnection; +import org.sufficientlysecure.rootcommands.RootCommands; +import org.sufficientlysecure.rootcommands.Shell; +import org.sufficientlysecure.rootcommands.Toolbox; +import org.sufficientlysecure.rootcommands.command.SimpleCommand; import org.torproject.android.Orbot; import org.torproject.android.R; import org.torproject.android.TorConstants; @@ -135,7 +139,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst { try { - int procId = TorServiceUtils.findProcessId(fileTor.getAbsolutePath()); + int procId = TorServiceUtils.findProcessId(fileTor.getCanonicalPath()); if (procId != -1) { @@ -457,40 +461,36 @@ public class TorService extends Service implements TorServiceConstants, TorConst int maxTry = 5; int currTry = 0; - while ((procId = TorServiceUtils.findProcessId(fileTor.getAbsolutePath())) != -1 && currTry++ < maxTry) + Shell shell = Shell.startShell(); + Toolbox tb = new Toolbox(shell); + + while ((procId = TorServiceUtils.findProcessId(fileTor.getCanonicalPath())) != -1 && currTry++ < maxTry) { + sendCallbackStatusMessage ("Found existing orphan Tor process; Trying to shutdown now (device restart may be needed)..."); logNotice("Found Tor PID=" + procId + " - attempt to shutdown now..."); - String[] cmd = { SHELL_CMD_KILL + ' ' + procId + "" }; - TorServiceUtils.doShellCommand(cmd,log, mHasRoot, false); - try { Thread.sleep(killDelayMs); } - catch (Exception e){} + tb.killAll(fileTor.getCanonicalPath()); + } if (procId == -1) { - while ((procId = TorServiceUtils.findProcessId(filePrivoxy.getAbsolutePath())) != -1) + while ((procId = TorServiceUtils.findProcessId(filePrivoxy.getCanonicalPath())) != -1) { logNotice("Found Privoxy PID=" + procId + " - killing now..."); - String[] cmd = { SHELL_CMD_KILL + ' ' + procId + "" }; - TorServiceUtils.doShellCommand(cmd,log, mHasRoot, false); - try { Thread.sleep(killDelayMs); } - catch (Exception e){} + tb.killAll(filePrivoxy.getCanonicalPath()); } - while ((procId = TorServiceUtils.findProcessId(fileObfsProxy.getAbsolutePath())) != -1) + while ((procId = TorServiceUtils.findProcessId(fileObfsProxy.getCanonicalPath())) != -1) { logNotice("Found ObfsProxy PID=" + procId + " - killing now..."); - String[] cmd = { SHELL_CMD_KILL + ' ' + procId + "" }; - TorServiceUtils.doShellCommand(cmd,log, mHasRoot, false); - try { Thread.sleep(killDelayMs); } - catch (Exception e){} + tb.killAll(fileObfsProxy.getCanonicalPath()); } } else @@ -543,15 +543,18 @@ public class TorService extends Service implements TorServiceConstants, TorConst { logNotice(fileBin.getName() + ": PRE: Is binary exec? " + fileBin.canExecute()); - - StringBuilder log = new StringBuilder (); + + if (!fileBin.canExecute()) + { + logNotice("(re)Setting permission on binary: " + fileBin.getCanonicalPath()); + Shell shell = Shell.startShell(new ArrayList<String>(), appBinHome.getAbsolutePath()); - logNotice("(re)Setting permission on binary: " + fileBin.getAbsolutePath()); - String[] cmd1 = {SHELL_CMD_CHMOD + ' ' + CHMOD_EXE_VALUE + ' ' + fileBin.getAbsolutePath()}; - TorServiceUtils.doShellCommand(cmd1, log, false, true); - - logNotice(fileBin.getName() + ": POST: Is binary exec? " + fileBin.canExecute()); - + shell.add(new SimpleCommand("chmod " + CHMOD_EXE_VALUE + ' ' + fileBin.getCanonicalPath())).waitForFinish(); + + File fileTest = new File(fileBin.getCanonicalPath()); + logNotice(fileTest.getName() + ": POST: Is binary exec? " + fileTest.canExecute()); + } + return fileBin.canExecute(); } @@ -600,7 +603,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst * * the idea is that if Tor is off then transproxy is off */ - private boolean enableTransparentProxy (boolean proxyAll, boolean enableTether) throws Exception + protected boolean enableTransparentProxy (boolean proxyAll, boolean enableTether) throws Exception { if (mTransProxy == null) @@ -668,7 +671,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst mTransProxy = new TorTransProxy(this); mTransProxy.clearTransparentProxyingAll(this); - // mTransProxy.clearTransparentProxyingByApp(this,AppManager.getApps(this)); clearNotifications(); @@ -679,53 +681,50 @@ public class TorService extends Service implements TorServiceConstants, TorConst { if (!fileTor.exists()) - throw new RuntimeException("Sorry Tor binary not installed properly: " + fileTor.getAbsolutePath()); + throw new RuntimeException("Sorry Tor binary not installed properly: " + fileTor.getCanonicalPath()); if (!fileTor.canExecute()) - throw new RuntimeException("Sorry can't execute Tor: " + fileTor.getAbsolutePath()); + throw new RuntimeException("Sorry can't execute Tor: " + fileTor.getCanonicalPath()); SharedPreferences prefs =getSharedPrefs(getApplicationContext()); - StringBuilder log = new StringBuilder(); - - String torrcPath = new File(appBinHome, TORRC_ASSET_KEY).getAbsolutePath(); + String torrcPath = new File(appBinHome, TORRC_ASSET_KEY).getCanonicalPath(); boolean transProxyTethering = prefs.getBoolean("pref_transparent_tethering", false); if (transProxyTethering) { - torrcPath = new File(appBinHome, TORRC_TETHER_KEY).getAbsolutePath(); + torrcPath = new File(appBinHome, TORRC_TETHER_KEY).getCanonicalPath(); } - String[] torCmd = { - "export HOME=" + appBinHome.getAbsolutePath(), - fileTor.getAbsolutePath() + " DataDirectory " + appCacheHome.getAbsolutePath() + " -f " + torrcPath + " || exit\n" - }; - - boolean runAsRootFalse = false; - boolean waitForProcess = false; int procId = -1; int attempts = 0; int torRetryWaitTimeMS = 2000; + ArrayList<String> alEnv = new ArrayList<String>(); + alEnv.add("HOME=" + appBinHome.getCanonicalPath()); + + Shell shell = Shell.startShell(alEnv,appBinHome.getCanonicalPath()); + SimpleCommand cmdTor = new SimpleCommand(fileTor.getCanonicalPath() + " DataDirectory " + appCacheHome.getCanonicalPath() + " -f " + torrcPath + "&"); + shell.add(cmdTor); + while (procId == -1 && attempts < MAX_START_TRIES) { - log = new StringBuilder(); sendCallbackStatusMessage(getString(R.string.status_starting_up)); - TorServiceUtils.doShellCommand(torCmd, log, runAsRootFalse, waitForProcess); + shell.add(cmdTor); Thread.sleep(torRetryWaitTimeMS); - procId = TorServiceUtils.findProcessId(fileTor.getAbsolutePath()); + procId = TorServiceUtils.findProcessId(fileTor.getCanonicalPath()); if (procId == -1) { Thread.sleep(torRetryWaitTimeMS); - procId = TorServiceUtils.findProcessId(fileTor.getAbsolutePath()); + procId = TorServiceUtils.findProcessId(fileTor.getCanonicalPath()); attempts++; } else @@ -738,7 +737,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (procId == -1) { - logNotice(log.toString()); + logNotice(cmdTor.getExitCode() + ": " + cmdTor.getOutput()); sendCallbackStatusMessage(getString(R.string.couldn_t_start_tor_process_)); throw new Exception ("Unable to start Tor"); @@ -748,8 +747,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst logNotice("Tor process id=" + procId); - //showToolbarNotification(getString(R.string.status_starting_up), NOTIFY_ID, R.drawable.ic_stat_tor); - initControlConnection (); processSettingsImpl(); @@ -761,32 +758,27 @@ public class TorService extends Service implements TorServiceConstants, TorConst logNotice( "Starting privoxy process"); - int privoxyProcId = TorServiceUtils.findProcessId(filePrivoxy.getAbsolutePath()); + int privoxyProcId = TorServiceUtils.findProcessId(filePrivoxy.getCanonicalPath()); StringBuilder log = null; int attempts = 0; + Shell shell = Shell.startShell(); + if (privoxyProcId == -1) { log = new StringBuilder(); - String privoxyConfigPath = new File(appBinHome, PRIVOXYCONFIG_ASSET_KEY).getAbsolutePath(); - - String[] cmds = - { filePrivoxy.getAbsolutePath() + " " + privoxyConfigPath + " &" }; - - logNotice (cmds[0]); + String privoxyConfigPath = new File(appBinHome, PRIVOXYCONFIG_ASSET_KEY).getCanonicalPath(); + SimpleCommand cmdPrivoxy = new SimpleCommand(filePrivoxy.getCanonicalPath() + " " + privoxyConfigPath + " &"); - boolean runAsRoot = false; - boolean waitFor = false; - - TorServiceUtils.doShellCommand(cmds, log, runAsRoot, waitFor); + shell.add(cmdPrivoxy); //wait one second to make sure it has started up Thread.sleep(1000); - while ((privoxyProcId = TorServiceUtils.findProcessId(filePrivoxy.getAbsolutePath())) == -1 && attempts < MAX_START_TRIES) + while ((privoxyProcId = TorServiceUtils.findProcessId(filePrivoxy.getCanonicalPath())) == -1 && attempts < MAX_START_TRIES) { logNotice("Couldn't find Privoxy process... retrying...\n" + log); Thread.sleep(3000); @@ -1523,9 +1515,12 @@ public class TorService extends Service implements TorServiceConstants, TorConst logNotice("Network connectivity is good. Waking Tor up..."); showToolbarNotification(getString(R.string.status_activated),NOTIFY_ID,R.drawable.ic_stat_tor,-1,prefPersistNotifications); + if (mHasRoot && mEnableTransparentProxy) + enableTransparentProxy(mTransProxyAll, mTransProxyTethering); } - } catch (RemoteException e) { - logException ("error applying mPrefs",e); + + } catch (Exception e) { + logException ("error updating state after network restart",e); } } } @@ -1596,8 +1591,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - mBinder.updateConfiguration("GeoIPFile", fileGeoIP.getAbsolutePath(), false); - mBinder.updateConfiguration("GeoIPv6File", fileGeoIP6.getAbsolutePath(), false); + mBinder.updateConfiguration("GeoIPFile", fileGeoIP.getCanonicalPath(), false); + mBinder.updateConfiguration("GeoIPv6File", fileGeoIP6.getCanonicalPath(), false); } catch (Exception e) @@ -1656,7 +1651,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (obfsBridges) { - mBinder.updateConfiguration("ClientTransportPlugin","obfs2 exec " + fileObfsProxy.getAbsolutePath() + " --managed", false); + mBinder.updateConfiguration("ClientTransportPlugin","obfs2 exec " + fileObfsProxy.getCanonicalPath() + " --managed", false); } mBinder.updateConfiguration("UpdateBridgesFromAuthority", "0", false); @@ -1723,7 +1718,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst { logNotice("hidden services are enabled"); - mBinder.updateConfiguration("HiddenServiceDir",appCacheHome.getAbsolutePath(), false); + mBinder.updateConfiguration("HiddenServiceDir",appCacheHome.getCanonicalPath(), false); //mBinder.updateConfiguration("RendPostPeriod", "600 seconds", false); //possible feature to investigate String hsPorts = prefs.getString("pref_hs_ports",""); @@ -1777,7 +1772,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst bw.println("nameserver 8.8.4.4"); bw.close(); - return file.getAbsolutePath(); + return file.getCanonicalPath(); } diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index 94f5c49..bd1c64c 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -44,9 +44,8 @@ public interface TorServiceConstants { public final static String SHELL_CMD_CP = "cp"; - public final static String CHMOD_EXE_VALUE = "700"; + public final static String CHMOD_EXE_VALUE = "770"; - public final static int FILE_WRITE_BUFFER_SIZE = 2048; //HTTP Proxy server port @@ -87,7 +86,7 @@ public interface TorServiceConstants { public static final String PREF_BINARY_PRIVOXY_VERSION_INSTALLED = "BINARY_PRIVOXY_VERSION_INTALLED"; //obfsproxy - public static final String OBFSPROXY_ASSET_KEY = "libobfsproxy.so"; + public static final String OBFSPROXY_ASSET_KEY = "obfsproxy"; public static final int MESSAGE_TRAFFIC_COUNT = 5; diff --git a/src/org/torproject/android/service/TorServiceUtils.java b/src/org/torproject/android/service/TorServiceUtils.java index c1f3145..e5cf25e 100644 --- a/src/org/torproject/android/service/TorServiceUtils.java +++ b/src/org/torproject/android/service/TorServiceUtils.java @@ -118,7 +118,7 @@ public class TorServiceUtils implements TorServiceConstants { } - + /** public static int doShellCommand(String[] cmds, StringBuilder log, boolean runAsRoot, boolean waitFor) throws Exception { @@ -222,4 +222,5 @@ public class TorServiceUtils implements TorServiceConstants { return exitCode; } + **/ } diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java index 7280eeb..0a9ae6f 100644 --- a/src/org/torproject/android/service/TorTransProxy.java +++ b/src/org/torproject/android/service/TorTransProxy.java @@ -3,12 +3,13 @@ package org.torproject.android.service; import java.io.File; import java.util.ArrayList; +import org.sufficientlysecure.rootcommands.Shell; +import org.sufficientlysecure.rootcommands.command.SimpleCommand; import org.torproject.android.TorConstants; import org.torproject.android.settings.TorifiedApp; import android.content.Context; import android.content.SharedPreferences; -import android.preference.PreferenceManager; import android.util.Log; public class TorTransProxy implements TorServiceConstants { @@ -276,26 +277,20 @@ public class TorTransProxy implements TorServiceConstants { public int setTransparentProxyingByApp(Context context, ArrayList<TorifiedApp> apps) throws Exception { - - boolean runRoot = true; - boolean waitFor = true; - String ipTablesPath = getIpTablesPath(context); - StringBuilder script = new StringBuilder(); + //StringBuilder script = new StringBuilder(); - StringBuilder res = new StringBuilder(); - int code = -1; - - String srcChainName = "OUTPUT"; + String srcChainName = "OUTPUT"; //run the delete commands in a separate process as it might error out - String[] cmdExecClear = {script.toString()}; - code = TorServiceUtils.doShellCommand(cmdExecClear, res, runRoot, waitFor); + //String[] cmdExecClear = {script.toString()}; + //code = TorServiceUtils.doShellCommand(cmdExecClear, res, runRoot, waitFor); //reset script - script = new StringBuilder(); - + + Shell shell = Shell.startRootShell(); + //build up array of shell cmds to execute under one root context for (TorifiedApp tApp:apps) { @@ -305,6 +300,8 @@ public class TorTransProxy implements TorServiceConstants { ) //if app is set to true { + StringBuilder script = new StringBuilder(); + logMessage("enabling transproxy for app: " + tApp.getUsername() + "(" + tApp.getUid() + ")"); // Set up port redirection @@ -318,7 +315,9 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -m tcp --syn"); script.append(" -j REDIRECT --to-ports "); script.append(TOR_TRANSPROXY_PORT); - script.append(" || exit\n"); + + shell.add(new SimpleCommand(script.toString())); + script = new StringBuilder(); // Same for DNS script.append(ipTablesPath); @@ -330,7 +329,9 @@ public class TorTransProxy implements TorServiceConstants { script.append(STANDARD_DNS_PORT); script.append(" -j REDIRECT --to-ports "); script.append(TOR_DNS_PORT); - script.append(" || exit\n"); + + shell.add(new SimpleCommand(script.toString())); + script = new StringBuilder(); int[] ports = {TOR_DNS_PORT,TOR_TRANSPROXY_PORT,PORT_SOCKS,PORT_HTTP}; @@ -347,7 +348,10 @@ public class TorTransProxy implements TorServiceConstants { script.append(" --dport "); script.append(port); script.append(" -j ACCEPT"); - script.append(" || exit\n"); + + shell.add(new SimpleCommand(script.toString())); + script = new StringBuilder(); + } // Allow loopback @@ -359,7 +363,9 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -p tcp"); script.append(" -o lo"); script.append(" -j ACCEPT"); - script.append(" || exit\n"); + + shell.add(new SimpleCommand(script.toString())); + script = new StringBuilder(); // Reject all other outbound TCP packets script.append(ipTablesPath); @@ -370,7 +376,9 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -p tcp"); script.append(" ! -d 127.0.0.1"); //allow access to localhost script.append(" -j REJECT"); - script.append(" || exit\n"); + + shell.add(new SimpleCommand(script.toString())); + script = new StringBuilder(); // Reject all other outbound UDP packets script.append(ipTablesPath); @@ -381,62 +389,52 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -p udp"); script.append(" ! -d 127.0.0.1"); //allow access to localhost script.append(" -j REJECT"); - script.append(" || exit\n"); - + + shell.add(new SimpleCommand(script.toString())); + } } - String[] cmdAdd = {script.toString()}; - - code = TorServiceUtils.doShellCommand(cmdAdd, res, runRoot, waitFor); - String msg = res.toString(); - - logMessage(cmdAdd[0] + ";errCode=" + code + ";resp=" + msg); - - return code; + return 1; } public int enableTetheringRules (Context context) throws Exception { - boolean runRoot = true; - boolean waitFor = true; - String ipTablesPath = getIpTablesPath(context); StringBuilder script = new StringBuilder(); - - StringBuilder res = new StringBuilder(); - int code = -1; String[] hwinterfaces = {"usb0","wl0.1"}; + Shell shell = Shell.startRootShell(); + for (int i = 0; i < hwinterfaces.length; i++) { + + script = new StringBuilder(); script.append(ipTablesPath); script.append(" -t nat -A PREROUTING -i "); script.append(hwinterfaces[i]); script.append(" -p udp --dport 53 -j REDIRECT --to-ports "); script.append(TOR_DNS_PORT); - script.append(" || exit\n"); + shell.add(new SimpleCommand(script.toString())); + + script = new StringBuilder(); script.append(ipTablesPath); script.append(" -t nat -A PREROUTING -i "); script.append(hwinterfaces[i]); script.append(" -p tcp -j REDIRECT --to-ports "); script.append(TOR_TRANSPROXY_PORT); - script.append(" || exit\n"); + + shell.add(new SimpleCommand(script.toString())); + } - String[] cmdAdd = {script.toString()}; - - code = TorServiceUtils.doShellCommand(cmdAdd, res, runRoot, waitFor); - String msg = res.toString(); - logMessage(cmdAdd[0] + ";errCode=" + code + ";resp=" + msg); - - return code; + return 0; } private void logMessage (String msg) @@ -450,36 +448,30 @@ public class TorTransProxy implements TorServiceConstants { public int clearTransparentProxyingAll(Context context) throws Exception { - boolean runRoot = true; - boolean waitFor = true; - String ipTablesPath = getIpTablesPath(context); StringBuilder script = new StringBuilder(); - StringBuilder res = new StringBuilder(); - int code = -1; + Shell shell = Shell.startRootShell(); + String chainName = "OUTPUT"; script = new StringBuilder(); - res = new StringBuilder(); script.append(ipTablesPath); script.append(" -t nat"); script.append(" -F ").append(chainName); //delete previous user-defined chain - script.append(" || exit\n"); - code = TorServiceUtils.doShellCommand(script.toString(), res, runRoot, waitFor); - logMessage("Exec resp: cmd> " + script.toString() + "; errCode=" + code + ";resp=" + res.toString()); - + + shell.add(new SimpleCommand(script.toString())); + script = new StringBuilder(); - res = new StringBuilder(); + script.append(ipTablesPath); script.append(" -t filter"); script.append(" -F ").append(chainName); //delete previous user-defined chain - script.append(" || exit\n"); - code = TorServiceUtils.doShellCommand(script.toString(), res, runRoot, waitFor); - logMessage("Exec resp: cmd> " + script.toString() + "; errCode=" + code + ";resp=" + res.toString()); - - return code; + + shell.add(new SimpleCommand(script.toString())); + + return 0; } public int setTransparentProxyingAll(Context context) throws Exception @@ -492,15 +484,15 @@ public class TorTransProxy implements TorServiceConstants { String ipTablesPath = getIpTablesPath(context); - StringBuilder script = new StringBuilder(); - StringBuilder res = new StringBuilder(); - int code = -1; + Shell shell = Shell.startRootShell(); int torUid = context.getApplicationInfo().uid; String srcChainName = "OUTPUT"; + StringBuilder script = new StringBuilder(); + // Allow everything for Tor script.append(ipTablesPath); script.append(" -t filter"); @@ -508,7 +500,9 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -m owner --uid-owner "); script.append(torUid); script.append(" -j ACCEPT"); - script.append(" || exit\n"); + + shell.add(new SimpleCommand(script.toString())); + script = new StringBuilder(); // Set up port redirection script.append(ipTablesPath); @@ -521,7 +515,9 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -m tcp --syn"); script.append(" -j REDIRECT --to-ports "); script.append(TOR_TRANSPROXY_PORT); - script.append(" || exit\n"); + + shell.add(new SimpleCommand(script.toString())); + script = new StringBuilder(); // Same for DNS script.append(ipTablesPath); @@ -535,7 +531,10 @@ public class TorTransProxy implements TorServiceConstants { script.append(STANDARD_DNS_PORT); script.append(" -j REDIRECT --to-ports "); script.append(TOR_DNS_PORT); - script.append(" || exit\n"); + + shell.add(new SimpleCommand(script.toString())); + script = new StringBuilder(); + /** int[] ports = {TOR_DNS_PORT,TOR_TRANSPROXY_PORT,PORT_SOCKS,PORT_HTTP}; @@ -564,8 +563,10 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -p tcp"); script.append(" -o lo"); script.append(" -j ACCEPT"); - script.append(" || exit\n"); + shell.add(new SimpleCommand(script.toString())); + script = new StringBuilder(); + if (TorService.ENABLE_DEBUG_LOG) { @@ -579,8 +580,10 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -j LOG"); script.append(" --log-prefix='ORBOT_DNSLEAK_PROTECTION'"); script.append(" --log-uid"); - script.append(" || exit\n"); - + + shell.add(new SimpleCommand(script.toString())); + script = new StringBuilder(); + script.append(ipTablesPath); script.append(" -t filter"); script.append(" -A ").append(srcChainName); @@ -588,7 +591,10 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -j LOG"); script.append(" --log-prefix='ORBOT_TCPLEAK_PROTECTION'"); script.append(" --log-uid"); - script.append(" || exit\n"); + + shell.add(new SimpleCommand(script.toString())); + script = new StringBuilder(); + } @@ -601,7 +607,9 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -p tcp"); script.append(" ! -d 127.0.0.1"); //allow access to localhost script.append(" -j REJECT"); - script.append(" || exit\n"); + + shell.add(new SimpleCommand(script.toString())); + script = new StringBuilder(); // Reject all other outbound UDP packets script.append(ipTablesPath); @@ -612,16 +620,10 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -p udp"); script.append(" ! -d 127.0.0.1"); //allow access to localhost script.append(" -j REJECT"); - script.append(" || exit\n"); - - String[] cmdExec = {script.toString()}; - - code = TorServiceUtils.doShellCommand(cmdExec, res, runRoot, waitFor); - String msg = res.toString(); - - logMessage("Exec resp: errCode=" + code + ";resp=" + msg); + + shell.add(new SimpleCommand(script.toString())); - return code; + return 0; } diff --git a/src/org/torproject/android/settings/SettingsPreferences.java b/src/org/torproject/android/settings/SettingsPreferences.java index 6cf1e0c..84b8c91 100644 --- a/src/org/torproject/android/settings/SettingsPreferences.java +++ b/src/org/torproject/android/settings/SettingsPreferences.java @@ -5,6 +5,7 @@ package org.torproject.android.settings; import java.util.Locale; +import org.sufficientlysecure.rootcommands.RootCommands; import org.torproject.android.R; import org.torproject.android.service.TorServiceUtils; @@ -121,22 +122,8 @@ public class SettingsPreferences if (prefRequestRoot.isChecked()) { - //boolean canRoot = TorServiceUtils.isRootPossible(); - boolean canRoot; - - try - { - StringBuilder res = new StringBuilder(); - String[] cmd = {"ls /data/data"}; //only root can do this! - int code = TorServiceUtils.doShellCommand(cmd, res, true, true); - canRoot = code > -1; - } - catch (Exception e) - { - //probably not root - canRoot = false; - } - + boolean canRoot = RootCommands.rootAccessGiven(); + getPreferenceScreen().getPreference(TRANSPROXY_GROUP_IDX).setEnabled(canRoot); prefRequestRoot.setChecked(canRoot); diff --git a/src/org/torproject/android/wizard/Permissions.java b/src/org/torproject/android/wizard/Permissions.java index 91e93db..dd4a217 100644 --- a/src/org/torproject/android/wizard/Permissions.java +++ b/src/org/torproject/android/wizard/Permissions.java @@ -1,11 +1,9 @@ package org.torproject.android.wizard; +import org.sufficientlysecure.rootcommands.RootCommands; import org.torproject.android.R; import org.torproject.android.TorConstants; -import org.torproject.android.service.Root; import org.torproject.android.service.TorService; -import org.torproject.android.service.TorServiceUtils; -import org.torproject.android.service.TorTransProxy; import android.app.Activity; import android.content.Context; @@ -22,7 +20,6 @@ import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.ImageView; import android.widget.TextView; -import android.widget.Toast; public class Permissions extends Activity implements TorConstants { @@ -41,8 +38,8 @@ public class Permissions extends Activity implements TorConstants { super.onStart(); setContentView(R.layout.layout_wizard_permissions); - stepThree(); - + stepFourRoot(); + } @Override @@ -64,21 +61,6 @@ public class Permissions extends Activity implements TorConstants { } - private void stepThree(){ - - boolean isRootPossible = new Root().isDeviceRooted(); - - if (isRootPossible) - { - stepFourRoot(); - } - else - { - stepFour(); - } - - } - private void stepFourRoot(){ String title = context.getString(R.string.wizard_permissions_title); @@ -112,24 +94,27 @@ public class Permissions extends Activity implements TorConstants { boolean isChecked) { + //this is saying do not use root + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); Editor pEdit = prefs.edit(); - pEdit.putBoolean(PREF_TRANSPARENT, !isChecked); - pEdit.putBoolean(PREF_TRANSPARENT_ALL, !isChecked); - - pEdit.putBoolean(PREF_HAS_ROOT, !isChecked); - + pEdit.putBoolean(PREF_TRANSPARENT, false); + pEdit.putBoolean(PREF_TRANSPARENT_ALL, false); + pEdit.putBoolean(PREF_HAS_ROOT, false); pEdit.commit(); + /* Button next = ((Button)findViewById(R.id.btnWizard2)); if(isChecked) next.setEnabled(true); else next.setEnabled(false); + */ + stepFour(); } @@ -142,46 +127,24 @@ public class Permissions extends Activity implements TorConstants { //Check and Install iptables - TorTransProxy.testOwnerModule(this) SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); - boolean hasRoot = prefs.getBoolean("has_root",false); - + boolean hasRoot = RootCommands.rootAccessGiven(); + Editor pEdit = prefs.edit(); + pEdit.putBoolean(PREF_HAS_ROOT,hasRoot); + pEdit.commit(); + if (!hasRoot) { - hasRoot = new Root().isDeviceRooted(); - Editor pEdit = prefs.edit(); - pEdit.putBoolean(PREF_HAS_ROOT,hasRoot); - pEdit.commit(); + stepFour(); } - - if (hasRoot) + else { - try { - /* - TorTransProxy ttProxy = new TorTransProxy(); - - int resp = ttProxy.testOwnerModule(context,ttProxy.getIpTablesPath(context)); - - if (resp != 0) - { - hasRoot = false; - Toast.makeText(context, "ERROR: IPTables OWNER module not available", Toast.LENGTH_LONG).show(); + startActivityForResult(new Intent(getBaseContext(), ConfigureTransProxy.class), 1); - Log.i(TorService.TAG,"ERROR: IPTables OWNER module not available"); - stepFour(); - } - */ - - } catch (Exception e) { - - hasRoot = false; - Log.d(TorService.TAG,"ERROR: IPTables OWNER module not available",e); - stepFour(); - } + } - - startActivityForResult(new Intent(getBaseContext(), ConfigureTransProxy.class), 1); } [View Less]

1 0

[meek/extension] Log the helper address.
by dcf＠torproject.org 07 Apr '14

07 Apr '14

commit 4b93398800605730e8ffd9dac83b3dc0424c8ebc Author: David Fifield <david(a)bamsoftware.com> Date: Sun Apr 6 10:10:31 2014 -0700 Log the helper address. --- meek-client/meek-client.go | 1 + 1 file changed, 1 insertion(+) diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index 6ce95f0..536dd69 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -252,6 +252,7 @@ func main() { if err != nil { log.Fatalf("can't resolve helper … [View More]

1 0

[meek/extension] Comment out some debugging.
by dcf＠torproject.org 07 Apr '14

07 Apr '14

commit 0b062b1f9c52ac39ce265b13d3e2013d954923f0 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Apr 6 19:17:20 2014 -0700 Comment out some debugging. --- firefox/components/main.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/firefox/components/main.js b/firefox/components/main.js index 74df52f..43979e3 100644 --- a/firefox/components/main.js +++ b/firefox/components/main.js @@ -80,13 +80,13 @@ MeekHTTPHelper.prototype = { // … [View More]

1 0

[meek/extension] Add meek-client-torbrowser program.
by dcf＠torproject.org 07 Apr '14

07 Apr '14

commit 7cba0a659c3abd4b92eb289b20263726d1c6d610 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Apr 6 10:07:33 2014 -0700 Add meek-client-torbrowser program. This program starts firefox with the meek-http-helper profile and then starts meek-client set up to talk to it. --- .gitignore | 1 + meek-client-torbrowser/Makefile | 18 +++++ meek-client-torbrowser/linux.go | 10 +++ meek-client-torbrowser/mac.go | 10 +++ meek-… [View More]client-torbrowser/main.go | 160 +++++++++++++++++++++++++++++++++++++ meek-client-torbrowser/windows.go | 10 +++ 6 files changed, 209 insertions(+) diff --git a/.gitignore b/.gitignore index e085380..3d5729c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /meek-client/meek-client +/meek-client-torbrowser/meek-client-torbrowser /meek-server/meek-server diff --git a/meek-client-torbrowser/Makefile b/meek-client-torbrowser/Makefile new file mode 100644 index 0000000..7ce013b --- /dev/null +++ b/meek-client-torbrowser/Makefile @@ -0,0 +1,18 @@ +DESTDIR = +PREFIX = /usr/local +BINDIR = $(PREFIX)/bin + +GOBUILDFLAGS = + +all: meek-client + +meek-client: *.go + go build $(GOBUILDFLAGS) + +clean: + rm -f meek-client-torbrowser + +fmt: + go fmt + +.PHONY: all install clean fmt diff --git a/meek-client-torbrowser/linux.go b/meek-client-torbrowser/linux.go new file mode 100644 index 0000000..73e363a --- /dev/null +++ b/meek-client-torbrowser/linux.go @@ -0,0 +1,10 @@ +// +build linux +// This file is compiled only on linux. It contains paths used by the linux +// browser bundle. +// http://golang.org/pkg/go/build/#hdr-Build_Constraints + +package main + +var firefoxPath = "Browser/firefox" +var firefoxProfilePath = "Data/Browser/profile.meek-http-helper" +var meekClientPath = "Tor/PluggableTransports/meek-client" diff --git a/meek-client-torbrowser/mac.go b/meek-client-torbrowser/mac.go new file mode 100644 index 0000000..6830da1 --- /dev/null +++ b/meek-client-torbrowser/mac.go @@ -0,0 +1,10 @@ +// +build darwin +// This file is compiled only on mac. It contains paths used by the mac +// browser bundle. +// http://golang.org/pkg/go/build/#hdr-Build_Constraints + +package main + +var firefoxPath = "../Contents/MacOS/TorBrowser.app/Contents/MacOS/firefox" +var firefoxProfilePath = "../Data/Browser/profile.meek-http-helper" +var meekClientPath = "PluggableTransports/meek-client" diff --git a/meek-client-torbrowser/main.go b/meek-client-torbrowser/main.go new file mode 100644 index 0000000..8890f6d --- /dev/null +++ b/meek-client-torbrowser/main.go @@ -0,0 +1,160 @@ +// The meek-client-torbrowser program starts a copy of Tor Browser running +// meek-http-helper in a special profile, and then starts meek-client set up to +// use the browser helper. +// +// Arguments to this program are passed unmodified to meek-client, with the +// addition of a --helper option pointing to the browser helper. +package main + +import ( + "bufio" + "io" + "io/ioutil" + "log" + "os" + "os/exec" + "os/signal" + "path/filepath" + "regexp" + "syscall" +) + +var helperAddrPattern *regexp.Regexp + +// Log a call to os.Process.Kill. +func logKill(p *os.Process) error { + log.Printf("killing PID %d", p.Pid) + err := p.Kill() + if err != nil { + log.Print(err) + } + return err +} + +// Log a call to os.Process.Signal. +func logSignal(p *os.Process, sig os.Signal) error { + log.Printf("sending signal %s to PID %d", sig, p.Pid) + err := p.Signal(sig) + if err != nil { + log.Print(err) + } + return err +} + +// Run firefox and return its exec.Cmd and stdout pipe. +func runFirefox() (cmd *exec.Cmd, stdout io.Reader, err error) { + var profilePath string + // Mac OS X needs an absolute profile path. + profilePath, err = filepath.Abs(firefoxProfilePath) + if err != nil { + return + } + cmd = exec.Command(firefoxPath, "-no-remote", "-profile", profilePath) + cmd.Stderr = os.Stderr + stdout, err = cmd.StdoutPipe() + if err != nil { + return + } + log.Printf("running firefox command %q", cmd.Args) + err = cmd.Start() + if err != nil { + return + } + log.Printf("firefox started with pid %d", cmd.Process.Pid) + return cmd, stdout, nil +} + +// Look for the magic meek-http-helper address string in the Reader, and return +// the address it contains. Start a goroutine to continue reading and discarding +// output of the Reader before returning. +func grepHelperAddr(r io.Reader) (string, error) { + var helperAddr string + scanner := bufio.NewScanner(r) + for scanner.Scan() { + line := scanner.Text() + if m := helperAddrPattern.FindStringSubmatch(line); m != nil { + helperAddr = m[1] + break + } + } + err := scanner.Err() + if err != nil { + return "", err + } + // Ran out of input before finding the pattern. + if helperAddr == "" { + return "", io.EOF + } + // Keep reading from the browser to avoid its output buffer filling. + go io.Copy(ioutil.Discard, r) + return helperAddr, nil +} + +// Run meek-client and return its exec.Cmd. +func runMeekClient(helperAddr string) (cmd *exec.Cmd, err error) { + args := os.Args[1:] + args = append(args, []string{"--helper", helperAddr}...) + cmd = exec.Command(meekClientPath, args...) + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + log.Printf("running meek-client command %q", cmd.Args) + err = cmd.Start() + if err != nil { + return + } + log.Printf("meek-client started with pid %d", cmd.Process.Pid) + return cmd, nil +} + +func main() { + var err error + + sigChan := make(chan os.Signal, 1) + signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM) + + // This magic string is emitted by meek-http-helper. + helperAddrPattern, err = regexp.Compile(`^meek-http-helper: listen (127\.0\.0\.1:\d+)$`) + if err != nil { + log.Fatal(err) + } + + // Start firefox. + firefoxCmd, stdout, err := runFirefox() + if err != nil { + log.Print(err) + return + } + defer logKill(firefoxCmd.Process) + + // Find out the helper's listening address. + helperAddr, err := grepHelperAddr(stdout) + if err != nil { + log.Print(err) + return + } + + // Start meek-client with the helper address. + meekClientCmd, err := runMeekClient(helperAddr) + if err != nil { + log.Print(err) + return + } + defer logKill(meekClientCmd.Process) + + sig := <-sigChan + log.Printf("sig %s", sig) + err = logSignal(meekClientCmd.Process, sig) + if err != nil { + log.Print(err) + } + + // If SIGINT, wait for a second SIGINT. + if sig == syscall.SIGINT { + sig := <-sigChan + log.Printf("sig %s", sig) + err = logSignal(meekClientCmd.Process, sig) + if err != nil { + log.Print(err) + } + } +} diff --git a/meek-client-torbrowser/windows.go b/meek-client-torbrowser/windows.go new file mode 100644 index 0000000..ed590d8 --- /dev/null +++ b/meek-client-torbrowser/windows.go @@ -0,0 +1,10 @@ +// +build windows +// This file is compiled only on windows. It contains paths used by the windows +// browser bundle. +// http://golang.org/pkg/go/build/#hdr-Build_Constraints + +package main + +var firefoxPath string = "Browser/firefox.exe" +var firefoxProfilePath = "Data/Browser/profile.meek-http-helper" +var meekClientPath = "Tor/PluggableTransports/meek-client.exe" [View Less]

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 07 Apr '14

07 Apr '14

commit e456299b5442f956cbe759e93811943593ece730 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 7 15:15:25 2014 +0000 Update translations for tails-persistence-setup_completed --- hu/hu.po | 317 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 317 insertions(+) diff --git a/hu/hu.po b/hu/hu.po new file mode 100644 index 0000000..aa9876a --- /dev/null +++ b/hu/hu.po @@ -0,0 +1,317 @@ +# SOME DESCRIPTIVE TITLE. +# … [View More]Copyright (C) YEAR Tails developers +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# lajos <mrlajos(a)gmail.com>, 2014 +# vargaviktor <viktor.varga(a)gmail.com>, 2013 +# vargaviktor <viktor.varga(a)gmail.com>, 2012 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" +"POT-Creation-Date: 2014-01-18 21:00+0100\n" +"PO-Revision-Date: 2014-04-07 15:00+0000\n" +"Last-Translator: lajos <mrlajos(a)gmail.com>\n" +"Language-Team: Hungarian (http://www.transifex.com/projects/p/torproject/language/hu/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: hu\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:48 +msgid "Personal Data" +msgstr "Személyes adat" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:50 +msgid "Keep files stored in the `Persistent' directory" +msgstr "A fájlok tárolása a 'Tartós' könyvtárban" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:58 +msgid "GnuPG" +msgstr "GnuPG" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:60 +msgid "GnuPG keyrings and configuration" +msgstr "GnuPG kulcstárolók és konfiguráció" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:68 +msgid "SSH Client" +msgstr "SSH kliens" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:70 +msgid "SSH keys, configuration and known hosts" +msgstr "SSH kulcsok, konfiguráció és ismert számítógépek" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:78 +msgid "Pidgin" +msgstr "Pidgin" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:80 +msgid "Pidgin profiles and OTR keyring" +msgstr "Pidgin profilok és OTR kulcstár" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:88 +msgid "Claws Mail" +msgstr "Claws Mail" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:90 +msgid "Claws Mail profiles and locally stored email" +msgstr "Claws Mail profilok és helyileg tárolt levelek" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:98 +msgid "GNOME Keyring" +msgstr "GNOME kulcstár" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:100 +msgid "Secrets stored by GNOME Keyring" +msgstr "GNOME kulcstárban tárolt titkok" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:108 +msgid "Network Connections" +msgstr "Hálózati kapcsolatok" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:110 +msgid "Configuration of network devices and connections" +msgstr "Hálózati eszközök és kapcsolatok beállítása" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:118 +msgid "Browser bookmarks" +msgstr "Böngésző könyvjelzők" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:120 +msgid "Bookmarks saved in Iceweasel browser" +msgstr "Az Iceweasel böngészőbe mentett könyvjelzők" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:128 +msgid "Printers" +msgstr "Nyomtatók" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:130 +msgid "Printers configuration" +msgstr "Nyomtatók konfigurálása" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:138 +msgid "APT Packages" +msgstr "APT csomagok" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 +msgid "Packages downloaded by APT" +msgstr "APT által letöltött csomagok" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:148 +msgid "APT Lists" +msgstr "APT listák" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 +msgid "Lists downloaded by APT" +msgstr "APT által letöltött listák" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:158 +msgid "Dotfiles" +msgstr "Dot-fájlok" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:160 +msgid "" +"Symlink into $HOME every file or directory found in the `dotfiles' directory" +msgstr "Symlink a $HOME könyvtárban minden fájlra és könyvtárra található a `dotfiles' könyvtárban" + +#: ../lib/Tails/Persistence/Setup.pm:227 +msgid "Setup Tails persistent volume" +msgstr "Tails persistent kötet telepítése" + +#: ../lib/Tails/Persistence/Setup.pm:337 +#, perl-format +msgid "Device %s already has a persistent volume." +msgstr "Az eszköz %s már rendelkezik persistent kötettel." + +#: ../lib/Tails/Persistence/Setup.pm:345 +#, perl-format +msgid "Device %s has not enough unallocated space." +msgstr "Az eszköz %s nem rendelkezik elég lefoglalatlan szabad hellyel." + +#: ../lib/Tails/Persistence/Setup.pm:353 ../lib/Tails/Persistence/Setup.pm:367 +#, perl-format +msgid "Device %s has no persistent volume." +msgstr "Az eszköz %s nem tartalmaz persistent kötetet." + +#: ../lib/Tails/Persistence/Setup.pm:359 +msgid "" +"Cannot delete the persistent volume while in use. You should restart Tails " +"without persistence." +msgstr "Nem lehet a persistent kötetet törölni amíg használatban van. Lehet újra kellene indítanod a Tails-t persistence kötet nélkül." + +#: ../lib/Tails/Persistence/Setup.pm:378 +msgid "Persistence volume is not unlocked." +msgstr "A persistence kötet zárolva van." + +#: ../lib/Tails/Persistence/Setup.pm:383 +msgid "Persistence volume is not mounted." +msgstr "A persistence kötet nincs csatolva." + +#: ../lib/Tails/Persistence/Setup.pm:388 +msgid "Persistence volume is not readable. Permissions or ownership problems?" +msgstr "A persistence kötet nem olvasható. Jogosultság vagy tulajdonos problémák?" + +#: ../lib/Tails/Persistence/Setup.pm:393 +msgid "Persistence volume is not writable. Maybe it was mounted read-only?" +msgstr "A persistence kötet nem írható. Talán olvasható-ként volt csatolva?" + +#: ../lib/Tails/Persistence/Setup.pm:402 +#, perl-format +msgid "Tails is running from non-USB / non-SDIO device %s." +msgstr "Tails nem USB vagy SDIO eszközről %s fut." + +#: ../lib/Tails/Persistence/Setup.pm:408 +#, perl-format +msgid "Device %s is optical." +msgstr "Az eszköz %s optikai." + +#: ../lib/Tails/Persistence/Setup.pm:415 +#, perl-format +msgid "Device %s was not created using Tails USB installer." +msgstr "Eszköz %s nem a Tails USB telepítővel volt létrehozva." + +#: ../lib/Tails/Persistence/Setup.pm:450 +msgid "Error" +msgstr "Hiba" + +#: ../lib/Tails/Persistence/Setup.pm:670 +msgid "Persistence wizard - Finished" +msgstr "Persistence varázsló - Befejezve" + +#: ../lib/Tails/Persistence/Setup.pm:673 +msgid "" +"Any changes you have made will only take effect after restarting Tails.\n" +"\n" +"You may now close this application." +msgstr "Bármilyen változtatás történt csak a Tails újraindítása után lép érvénybe.\n\nBezárhatod az alkalmazást." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:54 +msgid "Persistence wizard - Persistent volume creation" +msgstr "Persistence varázsló - Persistence kötet létrehozása" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:57 +msgid "Choose a passphrase to protect the persistent volume" +msgstr "Válassz jelszót a persistent kötet védelméhez." + +#. TRANSLATORS: size, device vendor, device model +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:61 +#, perl-format +msgid "" +"A %s persistent volume will be created on the %s %s device. Data on " +"this volume will be stored in an encrypted form protected by a passphrase." +msgstr "A %s persistent kötet létre lesz hozva itt %s %s eszközön. Az adatok titkosított formában lesznek tárolva egy jelszóval." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:66 +msgid "Create" +msgstr "Létrehoz" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:110 +msgid "" +"Beware! Using persistence has consequences that must be well " +"understood. Tails can't help you if you use it wrong! See <a " +"href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>Tails" +" documentation about persistence</a> to learn more." +msgstr "Figyelem! Persistence használata következményekkel jár amit meg kell érteni. Tails nem tud segíteni ha rosszul használod! nézd meg <a href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>Tails dokumentáció persistence-ről</a> további tanuláshoz." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:144 +msgid "Passphrase:" +msgstr "Jelszó:" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:154 +msgid "Verify Passphrase:" +msgstr "Jelszó ellenőrzése:" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:167 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:231 +msgid "Passphrase can't be empty" +msgstr "A jelszó nem lehet üres" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:222 +msgid "Passphrases do not match" +msgstr "A jelszavak nem egyeznek" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 +#: ../lib/Tails/Persistence/Step/Configure.pm:129 +msgid "Failed" +msgstr "Sikertelen" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:271 +msgid "Mounting Tails persistence partition." +msgstr "Tails persistence partíció csatolása." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 +msgid "The Tails persistence partition will be mounted." +msgstr "A Tails persistence partíció csatolva lesz." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 +msgid "Correcting permissions of the persistent volume." +msgstr "Hozzáférési jogosultságok javítása a persistent köteten." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 +msgid "The permissions of the persistent volume will be corrected." +msgstr "A hozzáférési jogosultságok javítva lettek a persistent köteten." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:308 +msgid "Creating..." +msgstr "Létrehozás..." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:311 +msgid "Creating the persistent volume..." +msgstr "Persistence kötet létrehozása..." + +#: ../lib/Tails/Persistence/Step/Configure.pm:61 +msgid "Persistence wizard - Persistent volume configuration" +msgstr "Persistence varázsló - Persistent kötet konfigurálása" + +#: ../lib/Tails/Persistence/Step/Configure.pm:64 +msgid "Specify the files that will be saved in the persistent volume" +msgstr "Határozd meg azokat a fájlokat amik a persistent kötetbe lesznek mentve" + +#. TRANSLATORS: partition, size, device vendor, device model +#: ../lib/Tails/Persistence/Step/Configure.pm:68 +#, perl-format +msgid "" +"The selected files will be stored in the encrypted partition %s (%s), on the" +" %s %s device." +msgstr "A kiválasztott fájlok tárolva lesznek a titkosított partíción %s (%s), itt %s %s eszközön." + +#: ../lib/Tails/Persistence/Step/Configure.pm:74 +msgid "Save" +msgstr "Mentés" + +#: ../lib/Tails/Persistence/Step/Configure.pm:143 +msgid "Saving..." +msgstr "Mentés..." + +#: ../lib/Tails/Persistence/Step/Configure.pm:146 +msgid "Saving persistence configuration..." +msgstr "Állandósági beállítások mentése..." + +#: ../lib/Tails/Persistence/Step/Delete.pm:41 +msgid "Persistence wizard - Persistent volume deletion" +msgstr "Állandó adat varázsló - Állandó kötet törlés" + +#: ../lib/Tails/Persistence/Step/Delete.pm:44 +msgid "Your persistent data will be deleted." +msgstr "Az állandó adatok törlésre kerülnek." + +#: ../lib/Tails/Persistence/Step/Delete.pm:48 +#, perl-format +msgid "" +"The persistent volume %s (%s), on the %s %s device, will be deleted." +msgstr "A persistent kötet %s (%s), itt %s %s eszközön törölve lesz." + +#: ../lib/Tails/Persistence/Step/Delete.pm:54 +msgid "Delete" +msgstr "Törlés" + +#: ../lib/Tails/Persistence/Step/Delete.pm:101 +msgid "Deleting..." +msgstr "Törlés..." + +#: ../lib/Tails/Persistence/Step/Delete.pm:104 +msgid "Deleting the persistent volume..." +msgstr "Az állandó kötet törlése..." [View Less]

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 07 Apr '14

07 Apr '14

commit f2676148c8d1577577311aacb77897b524a65a08 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 7 15:15:23 2014 +0000 Update translations for tails-persistence-setup --- hu/hu.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/hu/hu.po b/hu/hu.po index e4e39d6..aa9876a 100644 --- a/hu/hu.po +++ b/hu/hu.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers &… [View More]lt;tails(a)boum.org>\n" "POT-Creation-Date: 2014-01-18 21:00+0100\n" -"PO-Revision-Date: 2014-04-07 14:45+0000\n" +"PO-Revision-Date: 2014-04-07 15:00+0000\n" "Last-Translator: lajos <mrlajos(a)gmail.com>\n" "Language-Team: Hungarian (http://www.transifex.com/projects/p/torproject/language/hu/)\n" "MIME-Version: 1.0\n" @@ -86,11 +86,11 @@ msgstr "Az Iceweasel böngészőbe mentett könyvjelzők" #: ../lib/Tails/Persistence/Configuration/Presets.pm:128 msgid "Printers" -msgstr "" +msgstr "Nyomtatók" #: ../lib/Tails/Persistence/Configuration/Presets.pm:130 msgid "Printers configuration" -msgstr "" +msgstr "Nyomtatók konfigurálása" #: ../lib/Tails/Persistence/Configuration/Presets.pm:138 msgid "APT Packages" @@ -161,7 +161,7 @@ msgstr "A persistence kötet nem írható. Talán olvasható-ként volt csatolva #: ../lib/Tails/Persistence/Setup.pm:402 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." -msgstr "" +msgstr "Tails nem USB vagy SDIO eszközről %s fut." #: ../lib/Tails/Persistence/Setup.pm:408 #, perl-format @@ -202,7 +202,7 @@ msgstr "Válassz jelszót a persistent kötet védelméhez." msgid "" "A %s persistent volume will be created on the %s %s device. Data on " "this volume will be stored in an encrypted form protected by a passphrase." -msgstr "" +msgstr "A %s persistent kötet létre lesz hozva itt %s %s eszközön. Az adatok titkosított formában lesznek tárolva egy jelszóval." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:66 msgid "Create" @@ -248,11 +248,11 @@ msgstr "A Tails persistence partíció csatolva lesz." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 msgid "Correcting permissions of the persistent volume." -msgstr "" +msgstr "Hozzáférési jogosultságok javítása a persistent köteten." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 msgid "The permissions of the persistent volume will be corrected." -msgstr "" +msgstr "A hozzáférési jogosultságok javítva lettek a persistent köteten." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:308 msgid "Creating..." @@ -302,7 +302,7 @@ msgstr "Az állandó adatok törlésre kerülnek." #, perl-format msgid "" "The persistent volume %s (%s), on the %s %s device, will be deleted." -msgstr "" +msgstr "A persistent kötet %s (%s), itt %s %s eszközön törölve lesz." #: ../lib/Tails/Persistence/Step/Delete.pm:54 msgid "Delete" [View Less]

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 07 Apr '14

07 Apr '14

commit 09819ceaf9f0ef08086fbf1f4bf5583a8bb06bf9 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 7 14:45:25 2014 +0000 Update translations for tails-greeter_completed --- hu/hu.po | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 81 insertions(+), 16 deletions(-) diff --git a/hu/hu.po b/hu/hu.po index eca187e..74b8b24 100644 --- a/hu/hu.po +++ b/hu/hu.po @@ -3,15 +3,16 @@ # This file is distributed under the same … [View More]license as the PACKAGE package. # # Translators: +# lajos <mrlajos(a)gmail.com>, 2014 # vargaviktor <viktor.varga(a)gmail.com>, 2013 # vargaviktor <viktor.varga(a)gmail.com>, 2012 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-05-12 19:29+0200\n" -"PO-Revision-Date: 2013-05-22 12:45+0000\n" -"Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-03-17 13:54+0100\n" +"PO-Revision-Date: 2014-04-07 14:30+0000\n" +"Last-Translator: lajos <mrlajos(a)gmail.com>\n" "Language-Team: Hungarian (http://www.transifex.com/projects/p/torproject/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,26 +37,30 @@ msgid "Use persistence?" msgstr "Perzisztencia használata?" #: ../glade/persistencewindow.glade.h:5 +msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentáció</a>" + +#: ../glade/persistencewindow.glade.h:6 msgid "Yes" msgstr "Igen" -#: ../glade/persistencewindow.glade.h:6 +#: ../glade/persistencewindow.glade.h:7 msgid "No" msgstr "Nem" -#: ../glade/persistencewindow.glade.h:7 +#: ../glade/persistencewindow.glade.h:8 msgid "Passphrase:" msgstr "Jelszó:" -#: ../glade/persistencewindow.glade.h:8 +#: ../glade/persistencewindow.glade.h:9 msgid "Read-Only?" msgstr "Csak olvasható?" -#: ../glade/persistencewindow.glade.h:9 +#: ../glade/persistencewindow.glade.h:10 msgid "Wrong passphrase. Please try again." msgstr "Hibás jelszó. Próbálja meg újra." -#: ../glade/persistencewindow.glade.h:10 +#: ../glade/persistencewindow.glade.h:11 msgid "More options?" msgstr "További beállítások?" @@ -65,36 +70,96 @@ msgstr "Adminisztrátori jelszó" #: ../glade/optionswindow.glade.h:4 msgid "" +"<a " +"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentáció</a>" + +#: ../glade/optionswindow.glade.h:5 +msgid "" "Enter an administration password in case you need to perform administration tasks.\n" "Otherwise it will be disabled for better security." msgstr "Adjon meg egy adminisztrátori jelszót az adminisztrációs feladatokhoz.\n\nEgyébként kikapcsolt, a magasabb biztonság érdekében." -#: ../glade/optionswindow.glade.h:6 +#: ../glade/optionswindow.glade.h:7 msgid "Password:" msgstr "Jelszó:" -#: ../glade/optionswindow.glade.h:7 +#: ../glade/optionswindow.glade.h:8 msgid "Verify Password:" msgstr "Jelszó ellenőrzése:" -#: ../glade/optionswindow.glade.h:8 +#: ../glade/optionswindow.glade.h:9 msgid "Passwords do not match" msgstr "A jelszavak nem egyeznek" -#: ../glade/optionswindow.glade.h:9 -msgid "Windows Camouflage" +#: ../glade/optionswindow.glade.h:10 +msgid "Windows camouflage" msgstr "Windows álcázás" -#: ../glade/optionswindow.glade.h:10 +#: ../glade/optionswindow.glade.h:11 +msgid "" +"<a " +"href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Dokumentáció</a>" + +#: ../glade/optionswindow.glade.h:12 msgid "" "This option makes Tails look more like Microsoft Windows XP. This may be " "useful in public places in order to avoid attracting suspicion." msgstr "Ez az opció a Tails-t a Microsoft Windows XP-hez hasonlóvá teszi. Ez fontos lehet publikus helyeken, ahol figyelmet kelthetünk fel." -#: ../glade/optionswindow.glade.h:11 +#: ../glade/optionswindow.glade.h:13 msgid "Activate Microsoft Windows XP Camouflage" msgstr "Microsoft Windows XP álcázás bekapcsolása" +#: ../glade/optionswindow.glade.h:14 +msgid "MAC address spoofing" +msgstr "MAC cím spoofing" + +#: ../glade/optionswindow.glade.h:15 +msgid "" +"<a " +"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentáció</a>" + +#: ../glade/optionswindow.glade.h:16 +msgid "" +"Spoofing MAC addresses hides the serial number of your network cards to the " +"local networks. This can help you hide your geographical location." +msgstr "MAC cím spoofing elrejti a hálózati kártyád széria számát a helyi hálózaton. Ez segít elrejteni a földrajzi helyzeted." + +#: ../glade/optionswindow.glade.h:17 +msgid "" +"It is generally safer to spoof MAC addresses, but it might also raise " +"suspicion or cause network connection problems." +msgstr "Általában biztonságos elrejteni a MAC címet de ez gyanút kelthet vagy hálózati kapcsolati problémákat okozhat." + +#: ../glade/optionswindow.glade.h:18 +msgid "Spoof all MAC addresses" +msgstr "Összes MAC cím elrejtése" + +#: ../glade/optionswindow.glade.h:19 +msgid "Network configuration" +msgstr "Hálózati konfiguráció" + +#: ../glade/optionswindow.glade.h:20 +msgid "" +"<a " +"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentáció</a>" + +#: ../glade/optionswindow.glade.h:21 +msgid "" +"This computer's Internet connection is clear of obstacles. You would like to" +" connect directly to the Tor network." +msgstr "A számítógép internet kapcsolata akadályoktól mentes. Szeretnél közvetlenül kapcsolódni a Tor hálózathoz." + +#: ../glade/optionswindow.glade.h:22 +msgid "" +"This computer's Internet connection is censored, filtered, or proxied. You " +"need to configure bridge, firewall, or proxy settings." +msgstr "A számítógép internet kapcsolata cenzúrázott, szűrt vagy proxy-t használ. konfigurálnod kell a bridge, tűzfal vagy proxy beállításokat." + #: ../glade/langpanel.glade.h:1 msgid " " msgstr " " [View Less]

1 0