Skip to content

Commit

Permalink
some comments and test enhancements after reviewing usnistgov isse us…
Browse files Browse the repository at this point in the history 
…nistgov#16
  • Loading branch information
@jagliot
jagliot committed Jun 8, 2017
1 parent 9575b73 commit 87f76ca
Show file tree
Hide file tree
Showing 2 changed files with 118 additions and 90 deletions.
5 changes: 4 additions & 1 deletion src/gov/nist/javax/sip/message/MultipartMimeContentImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ public class MultipartMimeContentImpl implements MultipartMimeContent {
private ContentTypeHeader multipartMimeContentTypeHeader;
private String boundary;


/**
* Creates a default content list.
*/
Expand Down Expand Up @@ -127,7 +128,9 @@ public void createContentList(String body) throws ParseException {
Content partContent = parseBodyPart(bodyPart);
contentList.add(partContent);
} catch (NoSuchElementException e) {
//ignore
// ignore
// this is needed for a jain sip bug #16: the scanner which detects an extra
// delimiter when the body is a multiple of the buffer size
}
}
} else {
Expand Down
203 changes: 114 additions & 89 deletions src/test/unit/gov/nist/javax/sip/multipartmime/MultipartMimeParserTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import java.io.InputStream;
import java.util.Iterator;

import javax.sip.header.ContentDispositionHeader;
import javax.sip.header.ContentTypeHeader;
import javax.sip.message.Request;

Expand Down Expand Up @@ -63,82 +64,83 @@ public class MultipartMimeParserTest extends TestCase {
+ "Content-Type: application/x-nt-epid-frag-hex;version=ssLinux-6.00.18;base=x2611\r\n"
+ "Content-Disposition: signal;handling=optional\r\n\r\n" + "011201\r\n" + "00:1b:ba:fd:3d:0f\r\n"
+ "--unique-boundary-1\r\n";

private static final String usnistgovissue16 =
"--unique-boundary-1\n\r" +
"Content-Type: application/sdp\n\r" +
"\n\r" +
"v=0\n\r" +
"o=- 999999 999999 IN IP4 99.99.99.99\n\r" +
"s=-\n\r" +
"c=IN IP4 99.99.99.99\n\r" +
"t=0 0\n\r" +
"m=audio 99999 RTP/AVP 0 101\n\r" +
"a=rtpmap:0 PCMU/8000\n\r" +
"a=rtpmap:101 telephone-event/8000\n\r" +
"a=fmtp:101 0-15\n\r" +
"a=maxptime:20\n\r" +
"a=label:3199936\n\r" +
"a=inactive\n\r" +
"m=audio 0 RTP/AVP 0 101\n\r" +
"a=rtpmap:0 PCMU/8000\n\r" +
"a=rtpmap:101 telephone-event/8000\n\r" +
"a=fmtp:101 0-15\n\r" +
"a=maxptime:20\n\r" +
"a=inactive\n\r" +
"a=label:3199937\n\r" +
"\n\r" +
"--unique-boundary-1\n\r" +
"Content-Type: application/rs-metadata+xml\n\r" +
"Content-Disposition: recording-session\n\r" +
"\n\r" +
"<?xml version='1.0' encoding='UTF-8'?>\n" +
"<recording xmlns='urn:ietf:params:xml:ns:recording'>\n" +
"\t<datamode>complete</datamode>\n" +
"\t<session id=\"Rs1tZH5ISWxYdbRm/2R4fA==\">\n" +
"\t\t<associate-time>2016-10-12T12:07:18</associate-time>\n" +
"\t\t<extensiondata xmlns:apkt=\"http://acmepacket.com/siprec/extensiondata\">\n" +
"\t\t\t<apkt:ucid>00FA08XXXXXXXXXXXXXXXX;encoding=hex</apkt:ucid>\n" +
"\t\t\t<apkt:callerOrig>true</apkt:callerOrig>\n" +
"\t\t</extensiondata>\n" +
"\t</session>\n" +
"\t<participant id=\"nN+uOmP7TNBKfStkgTAKlw==\" session=\"Rs1tZH5ISWxYdbRm/2R4fA==\">\n" +
"\t\t<nameID aor=\"sip:[email protected]\">\n" +
"\t\t\t<name>&quot;XXXXXXXXXXXXXXX&quot;</name>\n" +
"\t\t</nameID>\n" +
"\t\t<send>GjCvWYoEQh9zN9TsyCVl/w==</send>\n" +
"\t\t<associate-time>2016-10-12T12:07:18</associate-time>\n" +
"\t\t<extensiondata xmlns:apkt=\"http://acmepacket.com/siprec/extensiondata\">\n" +
"\t\t\t<apkt:callingParty>true</apkt:callingParty>\n" +
"\t\t\t<apkt:request-uri>sip:[email protected]:5060</apkt:request-uri>\n" +
"\t\t\t<apkt:realm>outsideXO</apkt:realm>\n" +
"\t\t\t<apkt:header label=\"From\">\n" +
"\t\t\t\t<value>&quot;XXXXXXXXXXXXXXX&quot; &lt;sip:[email protected]:5060;pstn-params=9999999999&gt;;tag=xxxxxxxxxx</value>\n" +
"\t\t\t</apkt:header>\n" +
"\t\t\t<apkt:header label=\"To\">\n" +
"\t\t\t\t<value>&lt;sip:[email protected]:5060&gt;</value>\n" +
"\t\t\t</apkt:header>\n" +
"\t\t\t<apkt:header label=\"Call-ID\">\n" +
"\t\t\t\t<value>[email protected]</value>\n" +
"\t\t\t</apkt:header>\n" +
"\t\t</extensiondata>\n" +
"\t</participant>\n" +
"\t<participant id=\"xvlmDeIwSGZLYOtKGCUQvA==\" session=\"Rs1tZH5ISWxYdbRm/2R4fA==\">\n" +
"\t\t<nameID aor=\"sip:[email protected]\">\n" +
"\t\t\t<name>9999999999</name>\n" +
"\t\t</nameID>\n" +
"\t\t<associate-time>2016-10-12T12:07:18</associate-time>\n" +
"\t\t<extensiondata xmlns:apkt=\"http://acmepacket.com/siprec/extensiondata\">\n" +
"\t\t\t<apkt:callingParty>false</apkt:callingParty>\n" +
"\t\t</extensiondata>\n" +
"\t</participant>\n" +
"\t<stream id=\"GjCvWYoEQh9zN9TsyCVl/w==\" session=\"Rs1tZH5ISWxYdbRm/2R4fA==\">\n" +
"\t\t<label>3199936</label>\n" +
"\t\t<mode>separate</mode>\n" +
"\t\t<associate-time>2016-10-12T12:07:18</associate-time>\n" +
"\t</stream>\n" +
"</recording>\r\n" +
"--unique-boundary-1--\r\n";

//usnistgovissue16
private static final String specificBodySize =
"--unique-boundary-1\n\r" +
"Content-Type: application/sdp\n\r" +
"\n\r" +
"v=0\n\r" +
"o=- 999999 999999 IN IP4 99.99.99.99\n\r" +
"s=-\n\r" +
"c=IN IP4 99.99.99.99\n\r" +
"t=0 0\n\r" +
"m=audio 99999 RTP/AVP 0 101\n\r" +
"a=rtpmap:0 PCMU/8000\n\r" +
"a=rtpmap:101 telephone-event/8000\n\r" +
"a=fmtp:101 0-15\n\r" +
"a=maxptime:20\n\r" +
"a=label:3199936\n\r" +
"a=inactive\n\r" +
"m=audio 0 RTP/AVP 0 101\n\r" +
"a=rtpmap:0 PCMU/8000\n\r" +
"a=rtpmap:101 telephone-event/8000\n\r" +
"a=fmtp:101 0-15\n\r" +
"a=maxptime:20\n\r" +
"a=inactive\n\r" +
"a=label:3199937\n\r" +
"\n\r" +
"--unique-boundary-1\n\r" +
"Content-Type: application/rs-metadata+xml\n\r" +
"Content-Disposition: recording-session\n\r" +
"\n\r" +
"<?xml version='1.0' encoding='UTF-8'?>\n" +
"<recording xmlns='urn:ietf:params:xml:ns:recording'>\n" +
"\t<datamode>complete</datamode>\n" +
"\t<session id=\"Rs1tZH5ISWxYdbRm/2R4fA==\">\n" +
"\t\t<associate-time>2016-10-12T12:07:18</associate-time>\n" +
"\t\t<extensiondata xmlns:apkt=\"http://acmepacket.com/siprec/extensiondata\">\n" +
"\t\t\t<apkt:ucid>00FA08XXXXXXXXXXXXXXXX;encoding=hex</apkt:ucid>\n" +
"\t\t\t<apkt:callerOrig>true</apkt:callerOrig>\n" +
"\t\t</extensiondata>\n" +
"\t</session>\n" +
"\t<participant id=\"nN+uOmP7TNBKfStkgTAKlw==\" session=\"Rs1tZH5ISWxYdbRm/2R4fA==\">\n" +
"\t\t<nameID aor=\"sip:[email protected]\">\n" +
"\t\t\t<name>&quot;XXXXXXXXXXXXXXX&quot;</name>\n" +
"\t\t</nameID>\n" +
"\t\t<send>GjCvWYoEQh9zN9TsyCVl/w==</send>\n" +
"\t\t<associate-time>2016-10-12T12:07:18</associate-time>\n" +
"\t\t<extensiondata xmlns:apkt=\"http://acmepacket.com/siprec/extensiondata\">\n" +
"\t\t\t<apkt:callingParty>true</apkt:callingParty>\n" +
"\t\t\t<apkt:request-uri>sip:[email protected]:5060</apkt:request-uri>\n" +
"\t\t\t<apkt:realm>outsideXO</apkt:realm>\n" +
"\t\t\t<apkt:header label=\"From\">\n" +
"\t\t\t\t<value>&quot;XXXXXXXXXXXXXXX&quot; &lt;sip:[email protected]:5060;pstn-params=9999999999&gt;;tag=xxxxxxxxxx</value>\n" +
"\t\t\t</apkt:header>\n" +
"\t\t\t<apkt:header label=\"To\">\n" +
"\t\t\t\t<value>&lt;sip:[email protected]:5060&gt;</value>\n" +
"\t\t\t</apkt:header>\n" +
"\t\t\t<apkt:header label=\"Call-ID\">\n" +
"\t\t\t\t<value>[email protected]</value>\n" +
"\t\t\t</apkt:header>\n" +
"\t\t</extensiondata>\n" +
"\t</participant>\n" +
"\t<participant id=\"xvlmDeIwSGZLYOtKGCUQvA==\" session=\"Rs1tZH5ISWxYdbRm/2R4fA==\">\n" +
"\t\t<nameID aor=\"sip:[email protected]\">\n" +
"\t\t\t<name>9999999999</name>\n" +
"\t\t</nameID>\n" +
"\t\t<associate-time>2016-10-12T12:07:18</associate-time>\n" +
"\t\t<extensiondata xmlns:apkt=\"http://acmepacket.com/siprec/extensiondata\">\n" +
"\t\t\t<apkt:callingParty>false</apkt:callingParty>\n" +
"\t\t</extensiondata>\n" +
"\t</participant>\n" +
"\t<stream id=\"GjCvWYoEQh9zN9TsyCVl/w==\" session=\"Rs1tZH5ISWxYdbRm/2R4fA==\">\n" +
"\t\t<label>3199936</label>\n" +
"\t\t<mode>separate</mode>\n" +
"\t\t<associate-time>2016-10-12T12:07:18</associate-time>\n" +
"\t</stream>\n" +
"</recording>\r\n" +
"--unique-boundary-1--\r\n";

private static String contentString2 =
"--boundary1\n"
Expand Down Expand Up @@ -364,19 +366,26 @@ public void testMultiPartMimeMarshallingAndUnMarshallingWithExtraHeadersAndSpace
checkMultiPartWithSpaces(multipartMimeContent2);
}

public void testMultiParUsnistgovtIssue16() throws Exception {
SIPRequest request = new SIPRequest();
byte[] content = usnistgovissue16.getBytes("UTF-8");
ContentType contentType = new ContentType("multipart", "mixed");
contentType.setParameter("boundary", "unique-boundary-1");

request.setContent(content, contentType);
MultipartMimeContent multipartMimeContent = request.getMultipartMimeContent();
Iterator<Content> partContentIterator = multipartMimeContent.getContents();
Content part1 = partContentIterator.next();
Content part2 = partContentIterator.next();
assertEquals("application/rs-metadata+xml", ((ContentType) part2.getContentTypeHeader()).getValue());
}
/**
* specific test for MultiPart Usnistgov Issue 16
*/
public void testMultiPartMimeMarshallingAndUnMarshallingSpecificBodySize() throws Exception {
SIPRequest request = new SIPRequest();
byte[] content = specificBodySize.getBytes("UTF-8");
ContentType contentType = new ContentType("multipart", "mixed");
contentType.setParameter("boundary", "unique-boundary-1");

request.setContent(content, contentType);
MultipartMimeContent multipartMimeContent = request.getMultipartMimeContent();
checkMultiPartRecordingSession(multipartMimeContent);

// let's now marshall back the body and reparse it to check consistency
String bodyContent = multipartMimeContent.toString();
request.setContent(bodyContent, contentType);
MultipartMimeContent multipartMimeContent2 = request.getMultipartMimeContent();
checkMultiPartRecordingSession(multipartMimeContent2);

}

public void testMultiPartMimeMarshallingAndUnMarshallingWithANonMultiPartBodyWithAnEmptyLine() throws Exception {
SIPRequest request = new SIPRequest();
Expand Down Expand Up @@ -411,6 +420,22 @@ private void checkMultiPart(MultipartMimeContent multipartMimeContent) {
assertNotNull(sdpPart.getContent());
}

private void checkMultiPartRecordingSession(MultipartMimeContent multipartMimeContent) {
Iterator<Content> partContentIterator = multipartMimeContent.getContents();
Content sdpPart = partContentIterator.next();
Content secondPart = partContentIterator.next();

assertEquals("application/sdp", ((ContentType) sdpPart.getContentTypeHeader()).getValue());
assertFalse(sdpPart.getExtensionHeaders().hasNext());
assertNotNull(sdpPart.getContent());

assertEquals("application/rs-metadata+xml", ((ContentType) secondPart.getContentTypeHeader()).getValue());
assertFalse(secondPart.getExtensionHeaders().hasNext());
assertNotNull(secondPart.getContent());
ContentDispositionHeader contentDispositionHeader = secondPart.getContentDispositionHeader();
assertEquals("recording-session", contentDispositionHeader.getDispositionType());
}

private void checkMultiPartWithSpaces(MultipartMimeContent multipartMimeContent) {
Iterator<Content> partContentIterator = multipartMimeContent.getContents();
Content part1 = partContentIterator.next();
Expand Down

0 comments on commit 87f76ca

Please sign in to comment.