ziver/zutil
1
0
Fork 0
Code Issues Pull requests Activity Actions

Added DNS response TC

Browse source
This commit is contained in:
Ziver Koc 2016-04-19 14:33:29 +02:00
parent 31a47f52cd
commit ea206cc5b5
4 changed files with 90 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/zutil/converter/Converter.java
View file

@ -66,6 +66,17 @@ public class Converter {
(byte)((num >> 24)& 0xff)};
}
/**
* Converts a char array to a byte array.
*
* @return a byte array with the same binary value as the char.
*/
public static byte[] toBytes(char[] arr){
byte[] ret = new byte[arr.length];
System.arraycopy(arr, 0, ret, 0, arr.length);
return ret;
}
/**
* Converts a Integer to a byte
*

10
src/zutil/net/dns/DNSPacketQuestion.java
View file

@ -114,8 +114,8 @@ public class DNSPacketQuestion implements BinaryStruct {
* that this field may be an odd number of octets; no
* padding is used.
*/
@CustomBinaryField(index=10, serializer=DomainStringSerializer.class)
private String qName;
@CustomBinaryField(index=10, serializer=FQDNStringSerializer.class)
public String qName;
/**
* a two octet code which specifies the type of the query.
@ -124,14 +124,14 @@ public class DNSPacketQuestion implements BinaryStruct {
* can match more than one type of RR.
*/
@BinaryField(index=10, length=16)
private int qType;
public int qType;
/**
* a two octet code that specifies the class of the query.
* For example, the QCLASS field is IN for the Internet.
*/
@BinaryField(index=20, length=16)
private int qClass;
public int qClass;
@ -146,7 +146,7 @@ public class DNSPacketQuestion implements BinaryStruct {
public static class DomainStringSerializer implements BinaryFieldSerializer<String> {
public static class FQDNStringSerializer implements BinaryFieldSerializer<String> {
public String read(InputStream in, BinaryFieldData field) throws IOException {
StringBuilder str = new StringBuilder();

14
src/zutil/net/dns/DNSPacketResource.java
View file

@ -110,8 +110,8 @@ public class DNSPacketResource implements BinaryStruct {
/**
* a domain name to which this resource record pertains.
*/
@CustomBinaryField(index=10, serializer=DNSPacketQuestion.DomainStringSerializer.class)
private String name;
@CustomBinaryField(index=10, serializer=DNSPacketQuestion.FQDNStringSerializer.class)
public String name;
/**
* two octets containing one of the RR type codes. This
@ -119,14 +119,14 @@ public class DNSPacketResource implements BinaryStruct {
* field.
*/
@BinaryField(index=20, length=16)
private int type;
public int type;
/**
* two octets which specify the class of the data in the
* RDATA field.
*/
@BinaryField(index=30, length=16)
private int clazz;
public int clazz;
/**
* a 32 bit unsigned integer that specifies the time
@ -136,14 +136,14 @@ public class DNSPacketResource implements BinaryStruct {
* transaction in progress, and should not be cached.
*/
@BinaryField(index=40, length=32)
private int ttl;
public int ttl;
/**
* an unsigned 16 bit integer that specifies the length in
* octets of the RDATA field.
*/
@BinaryField(index=50, length=16)
private int length;
public int length;
/**
* a variable length string of octets that describes the
@ -153,7 +153,7 @@ public class DNSPacketResource implements BinaryStruct {
* the RDATA field is a 4 octet ARPA Internet address.
*/
@VariableLengthBinaryField(index=60, lengthField="length")
private String data;
public String data;
}

74
test/zutil/net/dns/DNSPacketTest.java
View file

@ -25,9 +25,14 @@
package zutil.net.dns;
import org.junit.Test;
import zutil.converter.Converter;
import zutil.parser.binary.BinaryStructOutputStream;
import static zutil.net.dns.DNSPacketQuestion.*;
import static org.junit.Assert.assertTrue;
import static zutil.net.dns.DNSPacketQuestion.*;
import static zutil.net.dns.DNSPacketResource.*;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@ -40,7 +45,7 @@ import static org.junit.Assert.assertEquals;
public class DNSPacketTest {
@Test
public void writeHeaderTest() throws IOException {
public void writeRequestHeaderTest() throws IOException {
DNSPacketHeader header = new DNSPacketHeader();
header.setDefaultQueryData();
header.countQuestion = 1;
@ -54,7 +59,7 @@ public class DNSPacketTest {
}
@Test
public void readHheaderTest() throws IOException {
public void readResponseHeaderTest() throws IOException {
DNSPacketHeader header = new DNSPacketHeader();
header.setDefaultResponseData();
header.countAnswerRecord = 1;
@ -68,7 +73,7 @@ public class DNSPacketTest {
}
@Test
public void writeDnsPacketHeaderTest() throws IOException {
public void writeRequestDnsPacketHeaderTest() throws IOException {
DNSPacket packet = new DNSPacket();
packet.getHeader().setDefaultQueryData();
@ -87,7 +92,7 @@ public class DNSPacketTest {
}
@Test
public void writeDnsPacketTest() throws IOException {
public void writeRequestDnsPacketTest() throws IOException {
DNSPacket packet = new DNSPacket();
packet.getHeader().setDefaultQueryData();
packet.addQuestion(new DNSPacketQuestion("appletv.local", QTYPE_A, QCLASS_IN));
@ -97,17 +102,72 @@ public class DNSPacketTest {
byte[] data = buffer.toByteArray();
byte[] expected = {
0x00, 0x00, 0x00, 0x00,
// HEADER
0x00, 0x00, // ID
0x00, 0x00, // FLAGS
0x00, 0x01, // QDCOUNT
0x00, 0x00, // ANCOUNT
0x00, 0x00, // NSCOUNT
0x00, 0x00, // ARCOUNT
// QUESTION
0x07, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x74, 0x76, // "apple"
0x05, 0x6c, 0x6f, 0x63, 0x61, 0x6c, // "local"
0x00, // NULL
0x00, 0x01, // QTYPE
0x00, 0x01 // QCLASS
0x00, 0x01 // QCLASS
};
assertArrayEquals(expected, data);
}
public void readRespnseDnsPacketTest() throws IOException {
char[] input = {
// HEADER
0x00, 0x00, // ID
0x84, 0x00, // FLAGS
0x00, 0x00, // QDCOUNT
0x00, 0x01, // ANCOUNT
0x00, 0x00, // NSCOUNT
0x00, 0x02, // ARCOUNT
// ANSWER RECORD
0x07, 0x61, 0x70, 0x70, 0x6c, 0x65, 0x74, 0x76, // FQDN: "apple"
0x05, 0x6c, 0x6f, 0x63, 0x61, 0x6c, // FQDN: "local"
0x00, // FQDN: NULL
0x00, 0x01, // TYPE: A/IPv4
0x80, 0x01, // CLASS: IPv4
0x00, 0x00, 0x78, 0x00, // TTL: 30720 seconds
0x00, 0x04, // IPv4 length
0x99, 0x6d, 0x07, 0x5a, // IPv4: 153.109.7.90
// ADDITIONAL RECORD
0xc0, 0x0c, // FQDN
0x00, 0x1c, // TYPE: AAAA/IPv6
0x80, 0x01, // CLASS: IPv6
0x00, 0x00, 0x78, 0x00, // TTL: 30720 seconds
0x00, 0x10, // IPv6 length
0xfe, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // IPv6
0x02, 0x23, 0x32, 0xff, 0xfe, 0xb1, 0x21, 0x52, // IPv6
// ADDITIONAL RECORD
0xc0, 0x0c, // FQDN
0x00, 0x2f, // TYPE: NSEC
0x80, 0x01, // CLASS: NSEC
0x00, 0x00, 0x78, 0x00, // TTL
0x00, 0x08, // NSEC length
0xc0, 0x0c, 0x00, 0x04, 0x40, 0x00, 0x00, 0x08 // NSEC
};
ByteArrayInputStream buffer = new ByteArrayInputStream(Converter.toBytes(input));
DNSPacket packet = DNSPacket.read(buffer);
// Assert Header
assertTrue("flagQueryResponse", packet.getHeader().flagQueryResponse);
assertTrue("flagAuthoritativeAnswer", packet.getHeader().flagAuthoritativeAnswer);
assertEquals("ANCOUNT", 1, packet.getHeader().countAnswerRecord);
assertEquals("ARCOUNT", 2, packet.getHeader().countAdditionalRecord);
// Assert Answer
assertEquals("No Of Answer records", 1, packet.getAnswerRecords().size());
DNSPacketResource answer = packet.getAnswerRecords().get(0);
assertEquals("TYPE", TYPE_A, answer.type);
assertEquals("CLASS", CLASS_IN, answer.clazz);
assertEquals("TTL", 30720, answer.ttl);
assertEquals("IPv4", new char[]{0x99, 0x6d, 0x07, 0x5a}, answer.data);
}
}