diff --git a/NonHTTPProxy/pom.xml b/NonHTTPProxy/pom.xml index c6c04bb..f9a4430 100644 --- a/NonHTTPProxy/pom.xml +++ b/NonHTTPProxy/pom.xml @@ -41,12 +41,12 @@ org.pcap4j pcap4j-core - 1.8.2 + 1.7.7 org.pcap4j pcap4j-packetfactory-static - 1.8.2 + 1.7.7 org.hibernate @@ -144,10 +144,16 @@ 5.0.1.Final - dnsjava - dnsjava - 3.3.0 - + dnsjava + dnsjava + 3.3.0 + + + net.java.dev.jna + jna + 5.13.0 + + NonHttp Burp Extension http://github.com/summitt/ diff --git a/NonHTTPProxy/src/josh/nonHttp/GenericUDPMiTMServer.java b/NonHTTPProxy/src/josh/nonHttp/GenericUDPMiTMServer.java index 79f7bbe..d330b41 100644 --- a/NonHTTPProxy/src/josh/nonHttp/GenericUDPMiTMServer.java +++ b/NonHTTPProxy/src/josh/nonHttp/GenericUDPMiTMServer.java @@ -248,7 +248,7 @@ public void run() { - byte[] buffer = new byte[1024]; + byte[] buffer = new byte[2056]; DatagramPacket packet = new DatagramPacket(buffer, buffer.length); diff --git a/NonHTTPProxy/src/josh/ui/NonHttpUI.java b/NonHTTPProxy/src/josh/ui/NonHttpUI.java index 8191194..f1e5000 100755 --- a/NonHTTPProxy/src/josh/ui/NonHttpUI.java +++ b/NonHTTPProxy/src/josh/ui/NonHttpUI.java @@ -2759,7 +2759,8 @@ public void NewDomainRequest(DNSTableEvent e) { String Domain = e.getDomain(); String ClientIp = e.getClientIP(); Vector vec = new Vector(); - SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd hh:mm:ss"); + //SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd hh:mm:ss"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); vec.add(sdf.format(new Date())); vec.add(Domain); vec.add(e.getResponseIp()); diff --git a/NonHTTPProxy/src/josh/ui/utils/NonHTTPTableModel.java b/NonHTTPProxy/src/josh/ui/utils/NonHTTPTableModel.java index f7116e9..77162a1 100755 --- a/NonHTTPProxy/src/josh/ui/utils/NonHTTPTableModel.java +++ b/NonHTTPProxy/src/josh/ui/utils/NonHTTPTableModel.java @@ -85,7 +85,8 @@ public Class getColumnClass(int columnIndex) @Override public Object getValueAt(int rowIndex, int columnIndex) { - SimpleDateFormat sdf = new SimpleDateFormat("hh:mm:ss dd MMM yy"); + //SimpleDateFormat sdf = new SimpleDateFormat("hh:mm:ss dd MMM yy"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); if(log.size() != 0){ LogEntry logEntry = log.get(rowIndex); diff --git a/NonHTTPProxy/src/josh/utils/Lister.java b/NonHTTPProxy/src/josh/utils/Lister.java index 3c95404..bad3a61 100644 --- a/NonHTTPProxy/src/josh/utils/Lister.java +++ b/NonHTTPProxy/src/josh/utils/Lister.java @@ -64,8 +64,10 @@ public void run() { System.out.println("###############"); System.out.println(addr); PcapNetworkInterface nif = Pcaps.getDevByAddress(addr); + if (nif == null) { - return; + System.out.println("No Interface Matches IP"); + return; } handle = nif.openLive(65536, PromiscuousMode.PROMISCUOUS, 10); @@ -76,10 +78,13 @@ public void run() { @Override public void gotPacket(Packet packet) { TcpPacket tcp = packet.get(TcpPacket.class); + System.out.println(tcp); IpV4Packet ip = packet.get(IpV4Packet.class); + System.out.println(ip); if(tcp == null || ip == null) return; + System.out.println("got a packet"); if(tcp.getHeader().getSyn() && !tcp.getHeader().getAck() ){ //&& !ip.getHeader().getSrcAddr().toString().equals("/"+IP)){ - SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd:hh:mm"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm"); String time = sdf.format(new Date()); String key = ip.getHeader().getSrcAddr().getHostAddress() + ":"+ tcp.getHeader().getDstPort().valueAsInt(); if(portsFound.containsKey(key) && portsFound.get(key).equals(time)) @@ -95,6 +100,7 @@ public void gotPacket(Packet packet) { }; try { + System.out.println("Lister Started"); pool = Executors.newCachedThreadPool(); handle.loop(-1, listener, pool); // This is better than handle.loop(5, listener); pool.shutdown();