[tor-commits] [orbot/master] remove integrated pluto code

n8fr8 at torproject.org n8fr8 at torproject.org
Fri Apr 3 17:04:05 UTC 2015


commit 431dff53a487a108cc18040785bd4dcda5113086
Author: Nathan Freitas <nathan at freitas.net>
Date:   Thu Feb 5 10:53:21 2015 -0500

    remove integrated pluto code
---
 src/org/torproject/android/pluto/PlutoFactory.java |   14 --
 .../torproject/android/pluto/PlutoInstaller.java   |  194 --------------------
 .../torproject/android/pluto/PlutoInstance.java    |    9 -
 3 files changed, 217 deletions(-)

diff --git a/src/org/torproject/android/pluto/PlutoFactory.java b/src/org/torproject/android/pluto/PlutoFactory.java
deleted file mode 100644
index 094bc5e..0000000
--- a/src/org/torproject/android/pluto/PlutoFactory.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.torproject.android.pluto;
-
-public class PlutoFactory {
-
-	
-	//load pluto.properties from res/raw/pluto.properties
-	
-	//ensure the PT binaries are installed and exe
-	
-	//expose the installed PT's via a simple factory instance interface .getPlutoInstance("obfs3")
-	
-	//return instance with interface for getting exe path, directly starting/stopping, monitoring status, etc
-	
-}
diff --git a/src/org/torproject/android/pluto/PlutoInstaller.java b/src/org/torproject/android/pluto/PlutoInstaller.java
deleted file mode 100644
index 4c312c4..0000000
--- a/src/org/torproject/android/pluto/PlutoInstaller.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/* Copyright (c) 2009, Nathan Freitas, Orbot / The Guardian Project - http://openideals.com/guardian */
-/* See LICENSE for licensing information */
-
-package org.torproject.android.pluto;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.StringBufferInputStream;
-import java.util.ArrayList;
-import java.util.concurrent.TimeoutException;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-import org.sufficientlysecure.rootcommands.Shell;
-import org.sufficientlysecure.rootcommands.command.SimpleCommand;
-import org.torproject.android.R;
-import org.torproject.android.TorConstants;
-
-import android.content.Context;
-import android.os.Build;
-import android.util.Log;
-
-public class PlutoInstaller {
-
-	
-	private File installFolder;
-	private Context context;
-
-	private final static int FILE_WRITE_BUFFER_SIZE = 1024;
-	private final static String CHMOD_EXE_VALUE = "770";
-	private final static String COMMAND_RM_FORCE = "rm -f ";
-	
-	public PlutoInstaller (Context context, File installFolder)
-	{
-		this.installFolder = installFolder;	
-		this.context = context;
-	}
-	
-	public boolean installBinaries () throws Exception
-	{
-		
-		InputStream is;
-        File outFile;
-        
-        installFolder.mkdirs();
-        
-        Shell shell = Shell.startShell(new ArrayList<String>(),installFolder.getAbsolutePath());
-        
-        String ptAsset = null;
-        
-		is = context.getResources().openRawResource(R.raw.obfsclient);
-		
-		outFile = new File(installFolder, ptAsset);
-		shell.add(new SimpleCommand(COMMAND_RM_FORCE + outFile.getAbsolutePath())).waitForFinish();
-		streamToFile(is,outFile, false, true);
-		
-		enableBinExec (outFile);
-		
-		return true;
-	}
-	
-	private boolean enableBinExec (File fileBin) throws Exception
-    {
-  
-    	if (!fileBin.canExecute())
-    	{
-			Shell shell = Shell.startShell();
-			shell.add(new SimpleCommand("chmod " + CHMOD_EXE_VALUE + ' ' + fileBin.getCanonicalPath())).waitForFinish();
-			
-			File fileTest = new File(fileBin.getCanonicalPath());
-			shell.close();
-    	}
-    	
-		return fileBin.canExecute();
-    }
-	
-	
-	/*
-	 * Write the inputstream contents to the file
-	 */
-    public static boolean streamToFile(InputStream stm, File outFile, boolean append, boolean zip) throws IOException
-
-    {
-        byte[] buffer = new byte[FILE_WRITE_BUFFER_SIZE];
-
-        int bytecount;
-
-    	OutputStream stmOut = new FileOutputStream(outFile.getAbsolutePath(), append);
-    	ZipInputStream zis = null;
-    	
-    	if (zip)
-    	{
-    		zis = new ZipInputStream(stm);    		
-    		ZipEntry ze = zis.getNextEntry();
-    		stm = zis;
-    		
-    	}
-    	
-        while ((bytecount = stm.read(buffer)) > 0)
-        {
-
-            stmOut.write(buffer, 0, bytecount);
-
-        }
-
-        stmOut.close();
-        stm.close();
-        
-        if (zis != null)
-        	zis.close();
-        
-        
-        return true;
-
-    }
-	
-    //copy the file from inputstream to File output - alternative impl
-	public static void copyFile (InputStream is, File outputFile)
-	{
-		
-		try {
-			outputFile.createNewFile();
-			DataOutputStream out = new DataOutputStream(new FileOutputStream(outputFile));
-			DataInputStream in = new DataInputStream(is);
-			
-			int b = -1;
-			byte[] data = new byte[1024];
-			
-			while ((b = in.read(data)) != -1) {
-				out.write(data);
-			}
-			
-			if (b == -1); //rejoice
-			
-			//
-			out.flush();
-			out.close();
-			in.close();
-			// chmod?
-			
-			
-			
-		} catch (IOException ex) {
-			Log.e(TorConstants.TAG, "error copying binary", ex);
-		}
-
-	}
-	
-	
-
-   
-	/**
-	 * Copies a raw resource file, given its ID to the given location
-	 * @param ctx context
-	 * @param resid resource id
-	 * @param file destination file
-	 * @param mode file permissions (E.g.: "755")
-	 * @throws IOException on error
-	 * @throws InterruptedException when interrupted
-	 */
-	public static void copyRawFile(Context ctx, int resid, File file, String mode, boolean isZipd) throws IOException, InterruptedException
-	{
-		final String abspath = file.getAbsolutePath();
-		// Write the iptables binary
-		final FileOutputStream out = new FileOutputStream(file);
-		InputStream is = ctx.getResources().openRawResource(resid);
-		
-		if (isZipd)
-    	{
-    		ZipInputStream zis = new ZipInputStream(is);    		
-    		ZipEntry ze = zis.getNextEntry();
-    		is = zis;
-    	}
-		
-		byte buf[] = new byte[1024];
-		int len;
-		while ((len = is.read(buf)) > 0) {
-			out.write(buf, 0, len);
-		}
-		out.close();
-		is.close();
-		// Change the permissions
-		Runtime.getRuntime().exec("chmod "+mode+" "+abspath).waitFor();
-	}
-   
-	
-
-}
diff --git a/src/org/torproject/android/pluto/PlutoInstance.java b/src/org/torproject/android/pluto/PlutoInstance.java
deleted file mode 100644
index 4585083..0000000
--- a/src/org/torproject/android/pluto/PlutoInstance.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.torproject.android.pluto;
-
-import java.io.File;
-
-public class PlutoInstance {
-
-	public String name;
-	public File fileBinary;
-}





More information about the tor-commits mailing list