Browse Source

Code clean-up

qam 10 years ago
parent
commit
2902d1e6c6

+ 0 - 5
src/de/tudarmstadt/informatik/hostage/protocol/ECHO.java

@@ -53,10 +53,5 @@ public class ECHO implements Protocol<ByteArray>{
 	public String toString() {
 		return "ECHO";
 	}
-	
-	@Override
-	public String getRequestContent() {
-		return HelperUtils.byteToStr(lastMessage);
-	}
 
 }

+ 0 - 5
src/de/tudarmstadt/informatik/hostage/protocol/FTP.java

@@ -115,10 +115,5 @@ public final class FTP implements Protocol<String> {
 	public String toString() {
 		return "FTP";
 	}
-	
-	@Override
-	public String getRequestContent() {
-		return lastMessage;
-	}
 
 }

+ 0 - 5
src/de/tudarmstadt/informatik/hostage/protocol/HTTP.java

@@ -71,11 +71,6 @@ public final class HTTP implements Protocol<String> {
 	public String toString() {
 		return "HTTP";
 	}
-	
-	@Override
-	public String getRequestContent() {
-		return lastMessage;
-	}
 
 	/**
 	 * Builds a html response that can be sent

+ 0 - 5
src/de/tudarmstadt/informatik/hostage/protocol/HTTPS.java

@@ -78,11 +78,6 @@ public class HTTPS implements SSLProtocol<String> {
 		return "HTTPS";
 	}
 	
-	@Override
-	public String getRequestContent() {
-		return lastMessage;
-	}
-
 	@Override
 	public SSLContext getSSLContext() {
 		String ksName = "https_cert.bks";

+ 0 - 5
src/de/tudarmstadt/informatik/hostage/protocol/MySQL.java

@@ -76,11 +76,6 @@ public class MySQL implements Protocol<ByteArray>{
 	public boolean isClosed() {
 		return state == STATE.CLOSED;
 	}
-	
-	@Override
-	public String getRequestContent() {
-		return HelperUtils.byteToStr(lastMessage);
-	}
 
 	/**
 	 * Wraps the response packet with the packet length and number

+ 0 - 2
src/de/tudarmstadt/informatik/hostage/protocol/Protocol.java

@@ -59,6 +59,4 @@ public interface Protocol<T> {
 	@Override 
 	String toString();
 	
-	String getRequestContent();
-	
 }

+ 0 - 86
src/de/tudarmstadt/informatik/hostage/protocol/SMB.java

@@ -134,92 +134,6 @@ public final class SMB implements Protocol<ByteArray> {
 	public String toString() {
 		return "SMB";
 	}
-	
-	@Override
-	public String getRequestContent()  {
-		String command = "Command: " + getCommandString(lastMessage[8]);
-//		return HelperUtils.byteToStr(lastMessage);
-		return command;
-	}
-	
-	private String getCommandString(byte cmd) {
-		switch(cmd) {
-		case 0x00: return "SMB_COM_CREATE_DIRECTORY";
-		case 0x01: return "SMB_COM_DELETE_DIRECTORY";
-		case 0x02: return "SMB_COM_OPEN";
-		case 0x03: return "SMB_COM_CREATE";
-		case 0x04: return "SMB_COM_CLOSE";
-		case 0x05: return "SMB_COM_FLUSH";
-		case 0x06: return "SMB_COM_DELETE";
-		case 0x07: return "SMB_COM_RENAME";
-		case 0x08: return "SMB_COM_QUERY_INFORMATION";
-		case 0x09: return "SMB_COM_SET_INFORMATION";
-		case 0x0A: return "SMB_COM_READ";
-		case 0x0B: return "SMB_COM_WRITE";
-		case 0x0C: return "SMB_COM_LOCK_BYTE_RANGE";
-		case 0x0D: return "SMB_COM_UNLOCK_BYTE_RANGE";
-		case 0x0E: return "SMB_COM_CREATE_TEMPORARY";
-		case 0x0F: return "SMB_COM_CREATE_NEW";
-		case 0x10: return "SMB_COM_CHECK_DIRECTORY";
-		case 0x11: return "SMB_COM_PROCESS_EXIT";
-		case 0x12: return "SMB_COM_SEEK";
-		case 0x13: return "SMB_COM_LOCK_AND_READ";
-		case 0x14: return "SMB_COM_WRITE_AND_UNLOCK";
-		case 0x1A: return "SMB_COM_READ_RAW";
-		case 0x1B: return "SMB_COM_READ_MPX";
-		case 0x1C: return "SMB_COM_READ_MPX_SECONDARY";
-		case 0x1D: return "SMB_COM_WRITE_RAW";
-		case 0x1E: return "SMB_COM_WRITE_MPX";
-		case 0x1F: return "SMB_COM_WRITE_MPX_SECONDARY";
-		case 0x20: return "SMB_COM_WRITE_COMPLETE";
-		case 0x21: return "SMB_COM_QUERY_SERVER";
-		case 0x22: return "SMB_COM_SET_INFORMATION2";
-		case 0x23: return "SMB_COM_QUERY_INFORMATION2";
-		case 0x24: return "SMB_COM_LOCKING_ANDX";
-		case 0x25: return "SMB_COM_TRANSACTION";
-		case 0x26: return "SMB_COM_TRANSACTION_SECONDARY";
-		case 0x27: return "SMB_COM_IOCTL";
-		case 0x28: return "SMB_COM_IOCTL_SECONDARY";
-		case 0x29: return "SMB_COM_COPY";
-		case 0x2A: return "SMB_COM_MOVE";
-		case 0x2B: return "SMB_COM_ECHO";
-		case 0x2C: return "SMB_COM_WRITE_AND_CLOSE";
-		case 0x2D: return "SMB_COM_OPEN_ANDX";
-		case 0x2E: return "SMB_COM_READ_ANDX";
-		case 0x2F: return "SMB_COM_WRITE_ANDX";
-		case 0x30: return "SMB_COM_NEW_FILE_SIZE";
-		case 0x31: return "SMB_COM_CLOSE_AND_TREE_DISC";
-		case 0x32: return "SMB_COM_TRANSACTION2";
-		case 0x33: return "SMB_COM_TRANSACTION2_SECONDARY";
-		case 0x34: return "SMB_COM_FIND_CLOSE2";
-		case 0x35: return "SMB_COM_FIND_NOTIFY_CLOSE";
-		case 0x70: return "SMB_COM_TREE_CONNECT";
-		case 0x71: return "SMB_COM_TREE_DISCONNECT";
-		case 0x72: return "SMB_COM_NEGOTIATE";
-		case 0x73: return "SMB_COM_SESSION_SETUP_ANDX";
-		case 0x74: return "SMB_COM_LOGOFF_ANDX";
-		case 0x75: return "SMB_COM_TREE_CONNECT_ANDX";
-		case (byte)0x80: return "SMB_COM_QUERY_INFORMATION_DISK";
-		case (byte)0x81: return "SMB_COM_SEARCH";
-		case (byte)0x82: return "SMB_COM_FIND";
-		case (byte)0x83: return "SMB_COM_FIND_UNIQUE";
-		case (byte)0x84: return "SMB_COM_FIND_CLOSE";
-		case (byte)0xA0: return "SMB_COM_NT_TRANSACT";
-		case (byte)0xA1: return "SMB_COM_NT_TRANSACT_SECONDARY";
-		case (byte)0xA2: return "SMB_COM_NT_CREATE_ANDX";
-		case (byte)0xA4: return "SMB_COM_NT_CANCEL";
-		case (byte)0xA5: return "SMB_COM_NT_RENAME";
-		case (byte)0xC0: return "SMB_COM_OPEN_PRINT_FILE";
-		case (byte)0xC1: return "SMB_COM_WRITE_PRINT_FILE";
-		case (byte)0xC2: return "SMB_COM_CLOSE_PRINT_FILE";
-		case (byte)0xC3: return "SMB_COM_GET_PRINT_QUEUE";
-		case (byte)0xD8: return "SMB_COM_READ_BULK";
-		case (byte)0xD9: return "SMB_COM_WRITE_BULK";
-		case (byte)0xDA: return "SMB_COM_WRITE_BULK_DATA";
-		case (byte)0xFF: return "SMB_COM_NONE";
-		default: return "Unknown Command";
-		}
-	}
 
 	/**
 	 * Converts the current system time into a byte[] with windows specific time

+ 0 - 5
src/de/tudarmstadt/informatik/hostage/protocol/SSH.java

@@ -166,11 +166,6 @@ public final class SSH implements Protocol<ByteArray> {
 	public String toString() {
 		return "SSH";
 	}
-	
-	@Override
-	public String getRequestContent() {
-		return HelperUtils.byteToStr(lastMessage);
-	}
 
 	/**
 	 * Wraps the packets with packet length and padding.

+ 0 - 5
src/de/tudarmstadt/informatik/hostage/protocol/TELNET.java

@@ -150,11 +150,6 @@ public final class TELNET implements Protocol<ByteArray> {
 	public Class<ByteArray> getType() {
 		return ByteArray.class;
 	}
-	
-	@Override
-	public String getRequestContent() {
-		return HelperUtils.byteToStr(lastMessage);
-	}
 
 	/**
 	 * Determines which options that are requested by the client will be done and which not