This is an automated email from the ASF dual-hosted git repository.
neuman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 72f4ba4 show the common name/hostname and version associated with the
ssl keys as well as setting a default hostname if no keys defined
72f4ba4 is described below
commit 72f4ba40254132bf48fb7f6272bbbd11c2535b8b
Author: Jeremy Mitchell <mitchell...@gmail.com>
AuthorDate: Fri Feb 9 08:12:53 2018 -0700
show the common name/hostname and version associated with the ssl keys as
well as setting a default hostname if no keys defined
---
.../common/api/DeliveryServiceSslKeysService.js | 4 +--
.../FormDeliveryServiceSslKeysController.js | 18 +++++++++++-
.../form.deliveryServiceSslKeys.tpl.html | 32 ++++++++++++++++++----
...FormGenerateDeliveryServiceSslKeysController.js | 18 +++++++++++-
.../form.GenerateDeliveryServiceSslKeys.tpl.html | 4 +--
5 files changed, 65 insertions(+), 11 deletions(-)
diff --git a/traffic_portal/app/src/common/api/DeliveryServiceSslKeysService.js
b/traffic_portal/app/src/common/api/DeliveryServiceSslKeysService.js
index a4d5cbc..46a8ec0 100644
--- a/traffic_portal/app/src/common/api/DeliveryServiceSslKeysService.js
+++ b/traffic_portal/app/src/common/api/DeliveryServiceSslKeysService.js
@@ -33,7 +33,7 @@ var DeliveryServiceSslKeysService = function($http, $q,
locationUtils, messageMo
$http.post(ENV.api['root'] + "deliveryservices/sslkeys/generate",
generateSslKeyForm)
.then(
function(result) {
- messageModel.setMessages([ { level: 'success', text: 'New SSL
Keys generated' } ], true);
+ messageModel.setMessages([ { level: 'success', text: 'SSL Keys
generated and updated for ' + deliveryService.xmlId } ], true);
request.resolve(result.data.response);
},
function(fault) {
@@ -60,7 +60,7 @@ var DeliveryServiceSslKeysService = function($http, $q,
locationUtils, messageMo
$http.post(ENV.api['root'] + "deliveryservices/sslkeys/add", sslKeys)
.then(
function(result) {
- messageModel.setMessages([ { level: 'success', text: 'New SSL
Keys added' } ], false);
+ messageModel.setMessages([ { level: 'success', text: 'SSL Keys
updated for ' + deliveryService.xmlId } ], false);
request.resolve(result.data.response);
},
function(fault) {
diff --git
a/traffic_portal/app/src/common/modules/form/deliveryServiceSslKeys/FormDeliveryServiceSslKeysController.js
b/traffic_portal/app/src/common/modules/form/deliveryServiceSslKeys/FormDeliveryServiceSslKeysController.js
index 8a75149..e3729d3 100644
---
a/traffic_portal/app/src/common/modules/form/deliveryServiceSslKeys/FormDeliveryServiceSslKeysController.js
+++
b/traffic_portal/app/src/common/modules/form/deliveryServiceSslKeys/FormDeliveryServiceSslKeysController.js
@@ -18,8 +18,23 @@
*/
var FormDeliveryServiceSslKeysController = function(deliveryService, sslKeys,
$scope, locationUtils, deliveryServiceSslKeysService, $uibModal, $anchorScroll,
formUtils) {
+
+ var setSSLKeys = function(sslKeys) {
+ if (!sslKeys.hostname) {
+ var url = deliveryService.exampleURLs[0],
+ defaultHostName = url.split("://")[1];
+ if (deliveryService.type.indexOf('HTTP') != -1) {
+ var parts = defaultHostName.split(".");
+ parts[0] = "*";
+ defaultHostName = parts.join(".");
+ }
+ sslKeys.hostname = defaultHostName;
+ }
+ return sslKeys;
+ };
+
$scope.deliveryService = deliveryService;
- $scope.sslKeys = sslKeys;
+ $scope.sslKeys = setSSLKeys(sslKeys);
$scope.hasError = formUtils.hasError;
$scope.hasPropertyError = formUtils.hasPropertyError;
@@ -53,6 +68,7 @@ var FormDeliveryServiceSslKeysController =
function(deliveryService, sslKeys, $s
// do nothing
});
};
+
};
FormDeliveryServiceSslKeysController.$inject = ['deliveryService', 'sslKeys',
'$scope', 'locationUtils', 'deliveryServiceSslKeysService', '$uibModal',
'$anchorScroll', 'formUtils'];
diff --git
a/traffic_portal/app/src/common/modules/form/deliveryServiceSslKeys/form.deliveryServiceSslKeys.tpl.html
b/traffic_portal/app/src/common/modules/form/deliveryServiceSslKeys/form.deliveryServiceSslKeys.tpl.html
index 961dd70..0e7e33f 100644
---
a/traffic_portal/app/src/common/modules/form/deliveryServiceSslKeys/form.deliveryServiceSslKeys.tpl.html
+++
b/traffic_portal/app/src/common/modules/form/deliveryServiceSslKeys/form.deliveryServiceSslKeys.tpl.html
@@ -21,17 +21,39 @@ under the License.
<div class="x_title">
<ol class="breadcrumb pull-left">
<li><a ng-click="navigateToPath('/delivery-services')">Delivery
Services</a></li>
- <li><a ng-click="navigateToPath('/delivery-services/' +
deliveryService.id + '?type=' +
deliveryService.type)">{{deliveryService.displayName}}</a></li>
+ <li><a ng-click="navigateToPath('/delivery-services/' +
deliveryService.id + '?type=' +
deliveryService.type)">{{deliveryService.xmlId}}</a></li>
<li class="active">SSL keys</li>
</ol>
- <ol class="breadcrumb pull-right">
- <li><button type="button" class="btn btn-success"
ng-click="generateKeys()">Generate New Keys</button></li>
- </ol>
+ <div class="pull-right" role="group">
+ <div class="btn-group" role="group" uib-dropdown
is-open="more.isopen">
+ <button type="button" class="btn btn-default dropdown-toggle"
uib-dropdown-toggle aria-haspopup="true" aria-expanded="false">
+ More
+ <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu-right dropdown-menu"
uib-dropdown-menu>
+ <li><a ng-click="generateKeys()">Generate SSL Keys</a></li>
+ </ul>
+ </div>
+ </div>
<div class="clearfix"></div>
</div>
<div class="x_content">
<br>
<form name="dsSslKeyForm" class="form-horizontal form-label-left"
novalidate>
+ <div class="form-group">
+ <label class="control-label col-md-2 col-sm-2
col-xs-12">Version</label>
+ <div class="col-md-10 col-sm-10 col-xs-12">
+ <input name="version" type="text" class="form-control"
ng-model="sslKeys.version" readonly>
+ </div>
+ </div>
+ <div class="form-group" ng-class="{'has-error':
hasError(dsSslKeyForm.hostname), 'has-feedback':
hasError(dsSslKeyForm.hostname)}">
+ <label class="control-label col-md-2 col-sm-2
col-xs-12">Common Name *</label>
+ <div class="col-md-10 col-sm-10 col-xs-12">
+ <input name="hostname" type="text" class="form-control"
ng-model="sslKeys.hostname" required autofocus>
+ <small class="input-error"
ng-show="hasPropertyError(dsSslKeyForm.hostname, 'required')">Required</small>
+ <span ng-show="hasError(dsSslKeyForm.hostname)"
class="form-control-feedback"><i class="fa fa-times"></i></span>
+ </div>
+ </div>
<div class="form-group" ng-class="{'has-error':
hasError(dsSslKeyForm.privateKey), 'has-feedback':
hasError(dsSslKeyForm.privateKey)}">
<label class="control-label col-md-2 col-sm-2
col-xs-12">Private Key *</label>
<div class="col-md-10 col-sm-10 col-xs-12">
@@ -57,7 +79,7 @@ under the License.
</div>
</div>
<div class="modal-footer">
- <button type="button" class="btn btn-success"
ng-disabled="dsSslKeyForm.$pristine || dsSslKeyForm.$invalid"
ng-click="save()">Save</button>
+ <button type="button" class="btn btn-success"
ng-disabled="dsSslKeyForm.$pristine || dsSslKeyForm.$invalid"
ng-click="save()">Update Keys</button>
</div>
</form>
</div>
diff --git
a/traffic_portal/app/src/common/modules/form/deliveryServiceSslKeys/generate/FormGenerateDeliveryServiceSslKeysController.js
b/traffic_portal/app/src/common/modules/form/deliveryServiceSslKeys/generate/FormGenerateDeliveryServiceSslKeysController.js
index aab5fb8..f2b3db2 100644
---
a/traffic_portal/app/src/common/modules/form/deliveryServiceSslKeys/generate/FormGenerateDeliveryServiceSslKeysController.js
+++
b/traffic_portal/app/src/common/modules/form/deliveryServiceSslKeys/generate/FormGenerateDeliveryServiceSslKeysController.js
@@ -18,10 +18,26 @@
*/
var FormGenerateDeliveryServiceSslKeysController = function(deliveryService,
sslKeys, sslRequest, $scope, $uibModal, locationUtils,
deliveryServiceSslKeysService, formUtils) {
+
+ var setSSLRequest = function(sslRequest) {
+ if (!sslRequest.hostname) {
+ console.log('setting default hostname');
+ var url = deliveryService.exampleURLs[0],
+ defaultHostName = url.split("://")[1];
+ if (deliveryService.type.indexOf('HTTP') != -1) {
+ var parts = defaultHostName.split(".");
+ parts[0] = "*";
+ defaultHostName = parts.join(".");
+ }
+ sslRequest.hostname = defaultHostName;
+ }
+ return sslRequest;
+ };
+
$scope.hasError = formUtils.hasError;
$scope.hasPropertyError = formUtils.hasPropertyError;
$scope.navigateToPath = locationUtils.navigateToPath;
- $scope.sslRequest = sslRequest;
+ $scope.sslRequest = setSSLRequest(sslRequest);
$scope.deliveryService = deliveryService;
$scope.countries = [
diff --git
a/traffic_portal/app/src/common/modules/form/deliveryServiceSslKeys/generate/form.GenerateDeliveryServiceSslKeys.tpl.html
b/traffic_portal/app/src/common/modules/form/deliveryServiceSslKeys/generate/form.GenerateDeliveryServiceSslKeys.tpl.html
index 28b0244..e04a97d 100644
---
a/traffic_portal/app/src/common/modules/form/deliveryServiceSslKeys/generate/form.GenerateDeliveryServiceSslKeys.tpl.html
+++
b/traffic_portal/app/src/common/modules/form/deliveryServiceSslKeys/generate/form.GenerateDeliveryServiceSslKeys.tpl.html
@@ -21,7 +21,7 @@ under the License.
<div class="x_title">
<ol class="breadcrumb pull-left">
<li><a ng-click="navigateToPath('/delivery-services')">Delivery
Services</a></li>
- <li><a ng-click="navigateToPath('/delivery-services/' +
deliveryService.id + '?type=' +
deliveryService.type)">{{deliveryService.displayName}}</a></li>
+ <li><a ng-click="navigateToPath('/delivery-services/' +
deliveryService.id + '?type=' +
deliveryService.type)">{{deliveryService.xmlId}}</a></li>
<li><a ng-click="navigateToPath('/delivery-services/' +
deliveryService.id + '/ssl-keys')">SSL Keys</a></li>
<li class="active">generate</li>
</ol>
@@ -83,7 +83,7 @@ under the License.
</div>
</div>
<div class="modal-footer">
- <button type="button" class="btn btn-success"
ng-disabled="dsGenerateSslKeyForm.$pristine || dsGenerateSslKeyForm.$invalid"
ng-click="confirmGenerate(sslRequest)">Generate</button>
+ <button type="button" class="btn btn-success"
ng-disabled="dsGenerateSslKeyForm.$pristine || dsGenerateSslKeyForm.$invalid"
ng-click="confirmGenerate(sslRequest)">Generate Keys</button>
</div>
</form>
</div>
--
To stop receiving notification emails like this one, please contact
neu...@apache.org.
