Skip to content

Commit

Permalink
Merge branch 'ttp-prod' of https://github.com/siteadmin/ett
Browse files Browse the repository at this point in the history
  • Loading branch information
ssavarala committed May 17, 2017
2 parents 1e41531 + a4a6dd4 commit 4e368a7
Show file tree
Hide file tree
Showing 23 changed files with 71 additions and 264 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ public class DirectMimeEntityValidator {
// DTS 190, All Mime Header Fields, Required
public DetailModel validateAllMimeHeaderFields(String header) {
String rfc = "RFC 2045: Section 1, 3, 5;http://tools.ietf.org/html/rfc2045;RFC 5322: Section 2.2, 3.2.2;http://tools.ietf.org/html/rfc5322";
header = header.replaceAll("\"[^\"]*\"", "");
if(header.contains("(") || header.contains(")")) {
return new DetailModel("190", "All MIME Headers", header, "Content-Disposition must not contain comment", rfc, Status.ERROR);
}
Expand Down
4 changes: 2 additions & 2 deletions gui/src/app/certification/certh1/certh1.js
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,12 @@ certCerth1.controller('Certh1Ctrl', ['$scope', '$stateParams','LogInfo','growl',
{ name: "Send", testList:['h2'],selectOption:'B'},
{ name: "Send - Delivery Notification for Direct", testList:['h2'],selectOption:'9'},
{ name: "Send using Direct+XDM", testList:['h2'],selectOption:'2'},
{ name: "Send using SOAP+XDR", testList:['h2'],selectOption:'3'},
{ name: "Send conversion XDR", testList:['h2'],selectOption:'3'},
{ name: "Send using Edge Protocol",testList:['h2'],selectOption:'4'},
{ name: "Receive", testList:['h2'],selectOption:'5'},
{ name: "Receive - Delivery Notification in Direct",testList:['h2'],selectOption:'10'},
{ name: "Receive using Direct+XDM",testList:['h2'],selectOption:'6'},
{ name: "Receive using SOAP+XDR",testList:['h2'],selectOption:'7'},
{ name: "Receive conversion XDR",testList:['h2'],selectOption:'7'},
{ name: "Receive using Edge Protocol",testList:['h2'],selectOption:'8'}
];

Expand Down
2 changes: 1 addition & 1 deletion gui/src/app/direct/cert-discovery/dcdt.js
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,7 @@ return dataobj.expandResult;
$scope.dcdtResult = null;
$scope.selectedItem = $scope.processes[0];
$scope.directAddress ="";
//$scope.testcase =$scope.selectedItem.code;
$scope.testcase ="";
$scope.alerts = [];
$scope.hostingResultError =[];
};
Expand Down
32 changes: 16 additions & 16 deletions gui/src/app/direct/cert-discovery/dcdt.tpl.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ <h2>Purpose of the {{pageTitle}} Direct Certificate Discovery Tool</h2>
<div class="panel-heading" ng-style="{backgroundColor:blue}">The tool is divided into two main testing areas:</a></div>
<div class="panel-body">
<div class="list-group">
<a ng-repeat="toolitem in datatool" class="list-group-item">
<div ng-click="gotodiv(toolitem.hreflink)">{{toolitem.name}}</div>
</a>
<div ng-repeat="toolitem in datatool" class="list-group-item">
<a href="" style="color: black" ng-click="gotodiv(toolitem.hreflink)">{{toolitem.name}}</a>
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -66,11 +66,11 @@ <h2 class="panel-title">Hosting - Verify your certificate can be discovered</h2>
</p>
</div>
<div ng-if=hostingResultError>
<div ng-if="hostingResultError.status ==='error'">
<div ng-if="hostingResultError.status ==='error'">
<div ng-repeat="errorobj in hostingResultError.errors.fields">
<uib-alert type="danger">{{errorobj[0].messages.toString()}}</uib-alert>
</div>
</div>
</div>
</div>
<div class="form-group form-group-buttons">
<span class="btn-group btn-group-sm">
Expand Down Expand Up @@ -101,15 +101,15 @@ <h2 class="panel-title">Hosting - Verify your certificate can be discovered</h2>
<h2 style="font-size: 18px;"> DCDT Information</h2>
<div class="row">
<div class="col-sm-12 btn-group-vertical" style="width:100%">
<p class="btn btn-default" ><a href="http://{{emailDomain}}.sitenv.org/dcdt/version" target="_blank" style="color: black">DCDT Version Information</a>
<p class="btn btn-default" ><a href="http://{{emailDomain}}.sitenv.org/dcdt/version" target="_blank" style="color: black">DCDT Version Information</a>
<a href="{{disclaimerLink}}" target="_blank" style="color: black"><i align="right" class="fa fa-external-link"></i></a></p>
<p class="btn btn-default" ><a href="https://groups.google.com/forum/#!forum/directtesttool" target="_blank" style="color: black">DCDT Forum</a>
<p class="btn btn-default" ><a href="https://groups.google.com/forum/#!forum/directtesttool" target="_blank" style="color: black">DCDT Forum</a>
<a href="{{disclaimerLink}}" target="_blank" style="color: black"><i align="right" class="fa fa-external-link"></i></a></p>
<p class="btn btn-default" ><a href="https://github.com/esacinc/dcdt/tree/master" target="_blank" style="color: black">DCDT Project Repository</a>
<p class="btn btn-default" ><a href="https://github.com/esacinc/dcdt/tree/master" target="_blank" style="color: black">DCDT Project Repository</a>
<a href="{{disclaimerLink}}" target="_blank" style="color: black"><i align="right" class="fa fa-external-link"></i></a></p>
<p class="btn btn-default" ><a href="http://confluence.siframework.org/display/DCDT" target="_blank" style="color: black">DCDT Documentation</a>
<p class="btn btn-default" ><a href="http://confluence.siframework.org/display/DCDT" target="_blank" style="color: black">DCDT Documentation</a>
<a href="{{disclaimerLink}}" target="_blank" style="color: black"><i align="right" class="fa fa-external-link"></i></a></p>
<p class="btn btn-default" ><a href="http://jira.oncprojectracking.org/browse/DCDT" target="_blank" style="color: black">DCDT Issue Tracker</a>
<p class="btn btn-default" ><a href="http://jira.oncprojectracking.org/browse/DCDT" target="_blank" style="color: black">DCDT Issue Tracker</a>
<a href="{{disclaimerLink}}" target="_blank" style="color: black"><i align="left" class="fa fa-external-link"></i></a></p>
</div>
</div>
Expand All @@ -118,9 +118,9 @@ <h2 style="font-size: 18px;"> DCDT Information</h2>
<h2 style="font-size:18px;"> Links to Direct Reference Information</h2>
<div class="row">
<div class="col-sm-12 btn-group-vertical" style="width:100%">
<p class="btn btn-default" ><a href="http://wiki.directproject.org/" target="_blank" style="color: black">Direct Project Wiki</a>
<p class="btn btn-default" ><a href="http://wiki.directproject.org/" target="_blank" style="color: black">Direct Project Wiki</a>
<a href="{{disclaimerLink}}" target="_blank" style="color: black"><i align="right" class="fa fa-external-link"></i></a></p>
<p class="btn btn-default" ><a href="https://github.com/aviars/getdc" target="_blank" style="color: black">Direct Certificate Download Utility</a>
<p class="btn btn-default" ><a href="https://github.com/aviars/getdc" target="_blank" style="color: black">Direct Certificate Download Utility</a>
<a href="{{disclaimerLink}}" target="_blank" style="color: black"><i align="right" class="fa fa-external-link"></i></a></p>
</div>
</div>
Expand Down Expand Up @@ -164,13 +164,13 @@ <h2 class="panel-title">Discover DCDT's Certificates</h2>
<hr>
<uib-alert ng-repeat="alert in discalerts" type="{{alert.type}}" close="closeAlert()">{{alert.msg}}</uib-alert>
<div ng-if=discoveryReport>
<div ng-if="discoveryReport.status ==='error'">
<div ng-if="discoveryReport.status ==='error'">
<div ng-repeat="errorobj in discoveryReport.errors.fields">
<uib-alert type="danger">{{errorobj[0].messages.toString()}}</uib-alert>
</div>
</div>
</div>
</div>

<div class="form-group form-group-buttons">
<button id="discovery-mail-mapping-submit" type="button" class="btn btn-primary start" ng-click="discValidate()"> <i class="glyphicon glyphicon-ok"></i> <span>Submit</span> </button>
<button id="discovery-mail-mapping-reset" type="reset" class="btn btn-default start" ng-click="resetDiscData()"> <i class="glyphicon glyphicon-refresh"></i> <span>Reset</span> </button>
Expand All @@ -180,7 +180,7 @@ <h2 class="panel-title">Discover DCDT's Certificates</h2>
<div ng-repeat="item in discoveryReport.items">

<div>

<uib-alert type="success">{{errorobj[0].messages.toString()}}
<strong> <span class="glyphicon glyphicon-ok-sign"></span>Discovery mail mapping modified</strong>:
<li><p style="font-size:70%; display: inline; width: 150px; word-break: break-all; word-wrap: break-word;">{{item.msg}}</p></li>
Expand Down
2 changes: 0 additions & 2 deletions gui/src/app/direct/message-validator/ccda-r2/ccda-r2.tpl.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@

<h2><i class="fa fa-pie-chart"></i> ONC C-CDA R2.1 Validator Tool</h2>

<a href="https://github.com/siteadmin/2015-C-CDA-Certification-Samples" target="_blank" > 2015 C-CDA Certification Sample Repository</a>

<div class="row">
<div class="col-md-12">
<ol>
Expand Down
6 changes: 5 additions & 1 deletion gui/src/app/edge/xdr/xdr.js
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,11 @@ edgeXdr.controller('XdrCtrl', ['$scope', 'XDRTestCasesDescription', 'growl', '$q
if (data.content.criteriaMet.toLowerCase() === 'pending') {
test.status = "pending";
if(data.content) {
test.endpoint = data.content.value.endpoint;
if (data.message ==="ran tc 7"){
test.endpoint = "http://"+data.content.value.endpoint;
}else{
test.endpoint = data.content.value.endpoint;
}
test.endpointTLS = data.content.value.endpointTLS;
}
} else if (data.content.criteriaMet.toLowerCase() === 'manual') {
Expand Down
4 changes: 2 additions & 2 deletions gui/src/assets/Criteria.json
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,14 @@
"selectOption":"['2','6','4','B','5']"
},
{
"name":"Criteria (i)(B) Send using SOAP+XDR",
"name":"Criteria (i)(B) Send conversion XDR",
"xdrTest":true,
"testList":"['h2']",
"criteria":"'h2-1'",
"selectOption":"['3','B']"
},
{
"name":"Criteria (i)(B) Receive using SOAP+XDR",
"name":"Criteria (i)(B) Receive conversion XDR",
"xdrTest":true,
"testList":"['h2']",
"criteria":"'h2-2'",
Expand Down
16 changes: 8 additions & 8 deletions gui/src/assets/directSettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,30 +93,30 @@
"cdaSamples": [{
"name": "CCDA_Ambulatory.xml"
}, {
"name": "CCDA_Ambulatory_in_XDM.zip"
"name": "CCDA_AMBULATORY_IN_XDM.ZIP"
}, {
"name": "CCDA_Inpatient.xml"
}, {
"name": "CCDA_Inpatient_in_XDM.zip"
"name": "CCDA_INPATIENT_IN_XDM.ZIP"
}, {
"name": "CCR_Sample1.xml"
}, {
"name": "CCR_Sample1_in_XDM.zip"
"name": "CCR_SAMPLE1_IN_XDM.ZIP"
}, {
"name": "C32_Sample1.xml"
}, {
"name": "C32_Sample1_in_XDM.zip"
"name": "C32_SAMPLE1_IN_XDM.ZIP"
}, {
"name": "CCR_Sample2.xml"
}, {
"name": "CCR_Sample2_in_XDM.zip"
"name": "CCR_SAMPLE2_IN_XDM.ZIP"
}, {
"name": "C32_Sample2.xml"
}, {
"name": "C32_Sample2_in_XDM.zip"
"name": "C32_SAMPLE2_IN_XDM.ZIP"
}, {
"name": "ToC_XDM_Full_Metadata.zip"
"name": "TOC_XDM_FULL_METADATA.ZIP"
}, {
"name": "ToC_XDM_Limited_Metadata.zip"
"name": "TOC_XDM_LIMITED_METADATA.ZIP"
}]
}
90 changes: 8 additions & 82 deletions gui/src/assets/smtptestCases.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,43 +95,7 @@
"readOnly": false,
"display": true
}]
}, {
"name": "SMTP Test 17 (Reject Invalid STARTTLS)",
"id": 17,
"protocol": "smtp",
"desc": "Verifies the ability of the receiving system to reject invalid STARTTLS commands.Hitting 'Run' will cause ETT to begin an invalid STARTTLS session. This session SHALL end before a message can be sent.",
"sutRole": "receiver",
"sutHisp": true,
"criteria":"['h2-8']",
"sutEdge": true
}, {
"name": "SMTP MT Test 17 - Generate Unique Message-ID (Processed MDN suite)",
"id": 117,
"protocol": "mu2",
"desc": "Verifies the ability of the sending system to send messages with unique message-IDs. The sending system will send multiple messages (at least 3) to [email protected]. Hitting 'Run' will cause ETT to check the message IDs for uniqueness (use this case if you opt for 'Message tracking using Processed MDN').",
"longDesc": "The credentials for authentication is [email protected] / vendortesting123 ",
"sutRole": "sender",
"sutHisp": false,
"sutEdge": true
}, {
"name": "SMTP MT Test 18 - Accept failure message for invalid recipient (Processed MDN suite - IMAP/POP Receiver)",
"id": 118,
"protocol": "mu2",
"desc": "Verifies the ability of the system to accept failure messages for some of the recipients. The system shall send a single email to multiple recipients: valid one ([email protected]) and an invalid address ([email protected] ). The MDNs are delivered to the 'Mail From' address. The failure MDN for invalid recipient [email protected] needs to be verified.",
"longDesc": "The credentials for authentication is [email protected] / vendortesting123 ",
"sutRole": "sender",
"sutHisp": false,
"sutEdge": true
}, {
"name": "SMTP MT Test 18(a) - Accept failure message for invalid recipient (Processed MDN suite - SMTP Receiver)",
"id": 119,
"protocol": "mu2",
"desc": "Verifies the ability of the system to accept failure messages for some of the recipients. The system shall send a single email to multiple recipients: valid one ([email protected]) and an invalid address ([email protected] ). Hitting 'Run' will cause the MDNs to be delivered using the account information specified in the profile using SMTP protocol with STARTTLS and SASL.The failure MDN for invalid recipient [email protected] needs to be verified.",
"longDesc": "The credentials for authentication is [email protected] / vendortesting123. This is a test case for systems that receive using SMTP. Note that 18a/47a are to be executed only for SMTP Receive configurations with pre-configured accounts.",
"sutRole": "sender",
"sutHisp": false,
"sutEdge": true
}, {
},{
"name": "SMTP MT Test 45 - Generate Unique Message-ID (IG for Delivery Notification Suite)",
"id": 145,
"protocol": "mu2",
Expand All @@ -150,24 +114,6 @@
"sutHisp": false,
"criteria":"['b1-2']",
"sutEdge": true
}, {
"name": "SMTP MT Test 47 - Accept failure message for invalid recipient (IG for Delivery Notification Suite - IMAP/POP Receiver)",
"id": 147,
"protocol": "mu2",
"desc": "Verifies the ability of the system to accept failure messages for some of the recipients. The system shall send a single email to multiple recipients: valid one ([email protected]) and an invalid address ([email protected] ). The MDNs are delivered to the 'Mail From' address. The failure MDN for invalid recipient [email protected] needs to be verified.",
"longDesc": "The credentials for authentication is [email protected] / vendortesting123. This is a test case for systems that receive using SMTP. ",
"sutRole": "sender",
"sutHisp": false,
"sutEdge": true
}, {
"name": "SMTP MT Test 47(a) - Accept failure message for invalid recipient (IG for Delivery Notification Suite - SMTP Receiver)",
"id": 120,
"protocol": "mu2",
"desc": "Verifies the ability of the system to accept failure messages for some of the recipients. The system shall send a single email to multiple recipients: valid one ([email protected]) and an invalid address ([email protected] ). Hitting 'Run' will cause the MDNs to be delivered using the account information specified in the profile using SMTP protocol with STARTTLS and SASL. The failure MDN for invalid recipient [email protected] needs to be verified.",
"longDesc": "The credentials for authentication is [email protected] / vendortesting123. This is a test case for systems that receive using SMTP. Note that 18a/47a are to be executed only for SMTP Receive configurations with pre-configured accounts.",
"sutRole": "sender",
"sutHisp": false,
"sutEdge": true
}, {
"name": "SMTP Test 22 (Reject invalid username/password)",
"id": 22,
Expand All @@ -178,7 +124,7 @@
"sutHisp": true,
"criteria":"['h2-8']",
"sutEdge": true
}, {
}, {
"name": "SMTP Test 25(a) (Receive Text and CCDA)",
"id": 91,
"protocol": "smtp",
Expand Down Expand Up @@ -278,7 +224,7 @@
"criteria":"['b1-4']",
"sutEdge": true
}, {
"name": "SMTP MT Test 1 (Message to Bad Address)",
"name": "SMTP MT Test 1 (Message to Non-Existent Address)",
"id": 101,
"desc": "Verify the ability of the system to provide a delivery failure message when a message is sent to an invalid address. Hitting 'Run' will cause ETT to send a message with a final destination that is not valid. Due to SMTP-SMTP configuration limitations, the proctor is to visually inspect for the receipt of the negative delivery status notification message. The expectation is that an appropriate delivery failure message will be returned.",
"longDesc": "The email is sent to [email protected]",
Expand Down Expand Up @@ -739,7 +685,7 @@
"criteria": "['h2-6']",
"sutEdge": false
}, {
"name": "POP Test 3-5, 11, 15",
"name": "POP Test 5, 11, 15",
"id": 303,
"protocol": "pop",
"desc": "Verifies POP3 STAT, STLS, RETR, LIST, RSET and QUIT commands are implemented",
Expand Down Expand Up @@ -768,16 +714,6 @@
"sutHisp": true,
"criteria": "['h2-6']",
"sutEdge": false
}, {
"name": "POP Test 12",
"id": 312,
"protocol": "pop",
"desc": "Verifies the ability of the Vendor HISP(POP Server) to produce Unique identifiers(UIDs).",
"longDesc": "The proctor has to send two emails to the vendor one after another and see that each message has a different UID. ",
"sutRole": "sender",
"sutHisp": true,
"criteria": "['h2-6']",
"sutEdge": false
}, {
"name": "POP Test 17",
"id": 317,
Expand All @@ -789,7 +725,7 @@
"criteria": "['h2-6']",
"sutEdge": false
}, {
"name": "IMAP Test 4-8, 11, 15",
"name": "IMAP Test 8, 11, 15",
"id": 205,
"protocol": "imap",
"desc": "Verifies the ability of the Vendor HISP to implement imap commands.(AUTHENTICATE, STARTTLS, LOGIN, SELECT, FETCH)",
Expand Down Expand Up @@ -818,17 +754,7 @@
"sutHisp": true,
"criteria": "['h2-5']",
"sutEdge": false
}, {
"name": "IMAP Test 12",
"id": 212,
"protocol": "imap",
"desc": "Verifies the ability of the Vendor HISP to generate Unique Identifiers(UIDs) for each message.",
"longDesc": "The proctor has to send two emails to the vendor one after another and see that each message has a different UID. ",
"sutRole": "sender",
"sutHisp": true,
"criteria": "['h2-5']",
"sutEdge": false
}, {
}, {
"name": "IMAP Test 17",
"id": 217,
"protocol": "imap",
Expand Down Expand Up @@ -919,7 +845,7 @@
"criteria":"['b1-5']",
"sutEdge": true
}, {
"name": "IMAP 31 (Receive)",
"name": "IMAP Test 31 (Receive)",
"id": 231,
"protocol": "imap",
"desc": "Verifies the ability of the SUT to accept different attachment types.",
Expand Down Expand Up @@ -1027,7 +953,7 @@
"criteria":"['b1-6']",
"sutEdge": true
}, {
"name": "POP 31 (Receive)",
"name": "POP Test 31 (Receive)",
"id": 331,
"protocol": "pop",
"desc": "Verifies the ability of the SUT to accept different attachment types.",
Expand Down
Loading

0 comments on commit 4e368a7

Please sign in to comment.