[jira] [Commented] (TC-336) Add ability to copy url_sig keys from one DS to another GH #1540
[ https://issues.apache.org/jira/browse/TC-336?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16137979#comment-16137979 ] ASF GitHub Bot commented on TC-336: --- Github user zhilhuan commented on the issue: https://github.com/apache/incubator-trafficcontrol/pull/790 https://github.com/apache/incubator-trafficcontrol/pull/855 > Add ability to copy url_sig keys from one DS to another GH #1540 > > > Key: TC-336 > URL: https://issues.apache.org/jira/browse/TC-336 > Project: Traffic Control > Issue Type: Improvement > Components: Traffic Ops, Traffic Vault >Reporter: Dewayne Richardson >Assignee: Dylan Volz >Priority: Minor > Labels: keys, url_signing > > There are some cases where we want to use the same URL sig keys for multiple > delivery services. Currently this is handled by using cURL and other manual > processes. Traffic Ops should support the ability to copy url sig keys from > one DS to another. When this happens Traffic Ops should also create the > necessary parameters for the target DS so that URL signing works. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (TC-336) Add ability to copy url_sig keys from one DS to another GH #1540
[ https://issues.apache.org/jira/browse/TC-336?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16137977#comment-16137977 ] ASF GitHub Bot commented on TC-336: --- Github user zhilhuan commented on the issue: https://github.com/apache/incubator-trafficcontrol/pull/790 @DylanVolz PR#855 for TC-547 is ready for review. > Add ability to copy url_sig keys from one DS to another GH #1540 > > > Key: TC-336 > URL: https://issues.apache.org/jira/browse/TC-336 > Project: Traffic Control > Issue Type: Improvement > Components: Traffic Ops, Traffic Vault >Reporter: Dewayne Richardson >Assignee: Dylan Volz >Priority: Minor > Labels: keys, url_signing > > There are some cases where we want to use the same URL sig keys for multiple > delivery services. Currently this is handled by using cURL and other manual > processes. Traffic Ops should support the ability to copy url sig keys from > one DS to another. When this happens Traffic Ops should also create the > necessary parameters for the target DS so that URL signing works. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (TC-336) Add ability to copy url_sig keys from one DS to another GH #1540
[ https://issues.apache.org/jira/browse/TC-336?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16137252#comment-16137252 ] ASF GitHub Bot commented on TC-336: --- Github user DylanVolz commented on the issue: https://github.com/apache/incubator-trafficcontrol/pull/790 waiting to merge on https://issues.apache.org/jira/browse/TC-547 > Add ability to copy url_sig keys from one DS to another GH #1540 > > > Key: TC-336 > URL: https://issues.apache.org/jira/browse/TC-336 > Project: Traffic Control > Issue Type: Improvement > Components: Traffic Ops, Traffic Vault >Reporter: Dewayne Richardson >Assignee: Dylan Volz >Priority: Minor > Labels: keys, url_signing > > There are some cases where we want to use the same URL sig keys for multiple > delivery services. Currently this is handled by using cURL and other manual > processes. Traffic Ops should support the ability to copy url sig keys from > one DS to another. When this happens Traffic Ops should also create the > necessary parameters for the target DS so that URL signing works. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (TC-336) Add ability to copy url_sig keys from one DS to another GH #1540
[ https://issues.apache.org/jira/browse/TC-336?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16137109#comment-16137109 ] ASF GitHub Bot commented on TC-336: --- Github user asfgit commented on the issue: https://github.com/apache/incubator-trafficcontrol/pull/790 Refer to this link for build results (access rights to CI server needed): https://builds.apache.org/job/incubator-trafficcontrol-PR-trafficops-test/79/ > Add ability to copy url_sig keys from one DS to another GH #1540 > > > Key: TC-336 > URL: https://issues.apache.org/jira/browse/TC-336 > Project: Traffic Control > Issue Type: Improvement > Components: Traffic Ops, Traffic Vault >Reporter: Dewayne Richardson >Assignee: Dylan Volz >Priority: Minor > Labels: keys, url_signing > > There are some cases where we want to use the same URL sig keys for multiple > delivery services. Currently this is handled by using cURL and other manual > processes. Traffic Ops should support the ability to copy url sig keys from > one DS to another. When this happens Traffic Ops should also create the > necessary parameters for the target DS so that URL signing works. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (TC-336) Add ability to copy url_sig keys from one DS to another GH #1540
[ https://issues.apache.org/jira/browse/TC-336?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16137106#comment-16137106 ] ASF GitHub Bot commented on TC-336: --- Github user asfgit commented on the issue: https://github.com/apache/incubator-trafficcontrol/pull/790 Refer to this link for build results (access rights to CI server needed): https://builds.apache.org/job/incubator-trafficcontrol-PR/119/ > Add ability to copy url_sig keys from one DS to another GH #1540 > > > Key: TC-336 > URL: https://issues.apache.org/jira/browse/TC-336 > Project: Traffic Control > Issue Type: Improvement > Components: Traffic Ops, Traffic Vault >Reporter: Dewayne Richardson >Assignee: Dylan Volz >Priority: Minor > Labels: keys, url_signing > > There are some cases where we want to use the same URL sig keys for multiple > delivery services. Currently this is handled by using cURL and other manual > processes. Traffic Ops should support the ability to copy url sig keys from > one DS to another. When this happens Traffic Ops should also create the > necessary parameters for the target DS so that URL signing works. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (TC-336) Add ability to copy url_sig keys from one DS to another GH #1540
[ https://issues.apache.org/jira/browse/TC-336?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16137104#comment-16137104 ] ASF GitHub Bot commented on TC-336: --- Github user DylanVolz commented on a diff in the pull request: https://github.com/apache/incubator-trafficcontrol/pull/790#discussion_r134556388 --- Diff: traffic_portal/app/src/common/api/DeliveryServiceUrlSigKeysService.js --- @@ -0,0 +1,70 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +var DeliveryServiceUrlSigKeysService = function(locationUtils, messageModel, $http, $q, ENV) { + + this.generateUrlSigKeys = function(dsXmlId) { + var request = $q.defer(); + $http.post(ENV.api['root'] + 'deliveryservices/xmlId/' + dsXmlId + '/urlkeys/generate') + .then( + function(result) { + messageModel.setMessages([ { level: 'success', text: 'URL Sig Keys generated' } ], true); --- End diff -- fault message included properly now. > Add ability to copy url_sig keys from one DS to another GH #1540 > > > Key: TC-336 > URL: https://issues.apache.org/jira/browse/TC-336 > Project: Traffic Control > Issue Type: Improvement > Components: Traffic Ops, Traffic Vault >Reporter: Dewayne Richardson >Assignee: Dylan Volz >Priority: Minor > Labels: keys, url_signing > > There are some cases where we want to use the same URL sig keys for multiple > delivery services. Currently this is handled by using cURL and other manual > processes. Traffic Ops should support the ability to copy url sig keys from > one DS to another. When this happens Traffic Ops should also create the > necessary parameters for the target DS so that URL signing works. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (TC-336) Add ability to copy url_sig keys from one DS to another GH #1540
[ https://issues.apache.org/jira/browse/TC-336?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16137105#comment-16137105 ] ASF GitHub Bot commented on TC-336: --- Github user DylanVolz commented on a diff in the pull request: https://github.com/apache/incubator-trafficcontrol/pull/790#discussion_r134556400 --- Diff: traffic_portal/app/src/common/api/DeliveryServiceUrlSigKeysService.js --- @@ -0,0 +1,70 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +var DeliveryServiceUrlSigKeysService = function(locationUtils, messageModel, $http, $q, ENV) { + + this.generateUrlSigKeys = function(dsXmlId) { + var request = $q.defer(); + $http.post(ENV.api['root'] + 'deliveryservices/xmlId/' + dsXmlId + '/urlkeys/generate') + .then( + function(result) { + messageModel.setMessages([ { level: 'success', text: 'URL Sig Keys generated' } ], true); + request.resolve(); + }, + function() { + messageModel.setMessages(fault.data.alerts, false); + request.reject(); + } + ); + return request.promise; + }; + + this.copyUrlSigKeys = function(dsXmlId, copyFromXmlId) { + var request = $q.defer(); +$http.post(ENV.api['root'] + 'deliveryservices/xmlId/' + dsXmlId + '/urlkeys/copyFromXmlId/' + copyFromXmlId) + .then( + function(result) { + messageModel.setMessages([ { level: 'success', text: 'URL Sig Keys copied' } ], true); --- End diff -- fault message included properly now. > Add ability to copy url_sig keys from one DS to another GH #1540 > > > Key: TC-336 > URL: https://issues.apache.org/jira/browse/TC-336 > Project: Traffic Control > Issue Type: Improvement > Components: Traffic Ops, Traffic Vault >Reporter: Dewayne Richardson >Assignee: Dylan Volz >Priority: Minor > Labels: keys, url_signing > > There are some cases where we want to use the same URL sig keys for multiple > delivery services. Currently this is handled by using cURL and other manual > processes. Traffic Ops should support the ability to copy url sig keys from > one DS to another. When this happens Traffic Ops should also create the > necessary parameters for the target DS so that URL signing works. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (TC-336) Add ability to copy url_sig keys from one DS to another GH #1540
[ https://issues.apache.org/jira/browse/TC-336?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16137102#comment-16137102 ] ASF GitHub Bot commented on TC-336: --- Github user DylanVolz commented on a diff in the pull request: https://github.com/apache/incubator-trafficcontrol/pull/790#discussion_r134555976 --- Diff: traffic_ops/app/lib/TrafficOpsRoutes.pm --- @@ -571,6 +571,11 @@ sub api_routes { ->to( 'KeysUrlSig#copy_url_sig_keys', namespace => 'API::DeliveryService' ); $r->get("/api/$version/deliveryservices/xmlId/:xmlId/urlkeys")->over( authenticated => 1, not_ldap => 1 ) ->to( 'KeysUrlSig#view_by_xmlid', namespace => 'API::DeliveryService' ); + # -- DELIVERY SERVICE: VIEW URL SIG KEYS BY ID + $r->get("/api/$version/deliveryservices/:id/urlkeys")->over( authenticated => 1, not_ldap => 1 ) --- End diff -- documentation has now been added > Add ability to copy url_sig keys from one DS to another GH #1540 > > > Key: TC-336 > URL: https://issues.apache.org/jira/browse/TC-336 > Project: Traffic Control > Issue Type: Improvement > Components: Traffic Ops, Traffic Vault >Reporter: Dewayne Richardson >Assignee: Dylan Volz >Priority: Minor > Labels: keys, url_signing > > There are some cases where we want to use the same URL sig keys for multiple > delivery services. Currently this is handled by using cURL and other manual > processes. Traffic Ops should support the ability to copy url sig keys from > one DS to another. When this happens Traffic Ops should also create the > necessary parameters for the target DS so that URL signing works. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (TC-336) Add ability to copy url_sig keys from one DS to another GH #1540
[ https://issues.apache.org/jira/browse/TC-336?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16135846#comment-16135846 ] ASF GitHub Bot commented on TC-336: --- Github user mitchell852 commented on a diff in the pull request: https://github.com/apache/incubator-trafficcontrol/pull/790#discussion_r134332821 --- Diff: traffic_ops/app/lib/TrafficOpsRoutes.pm --- @@ -571,6 +571,11 @@ sub api_routes { ->to( 'KeysUrlSig#copy_url_sig_keys', namespace => 'API::DeliveryService' ); $r->get("/api/$version/deliveryservices/xmlId/:xmlId/urlkeys")->over( authenticated => 1, not_ldap => 1 ) ->to( 'KeysUrlSig#view_by_xmlid', namespace => 'API::DeliveryService' ); + # -- DELIVERY SERVICE: VIEW URL SIG KEYS BY ID + $r->get("/api/$version/deliveryservices/:id/urlkeys")->over( authenticated => 1, not_ldap => 1 ) --- End diff -- did you make sure to update the applicable .rst doc with this new endpoint? > Add ability to copy url_sig keys from one DS to another GH #1540 > > > Key: TC-336 > URL: https://issues.apache.org/jira/browse/TC-336 > Project: Traffic Control > Issue Type: Improvement > Components: Traffic Ops, Traffic Vault >Reporter: Dewayne Richardson >Assignee: Dylan Volz >Priority: Minor > Labels: keys, url_signing > > There are some cases where we want to use the same URL sig keys for multiple > delivery services. Currently this is handled by using cURL and other manual > processes. Traffic Ops should support the ability to copy url sig keys from > one DS to another. When this happens Traffic Ops should also create the > necessary parameters for the target DS so that URL signing works. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (TC-336) Add ability to copy url_sig keys from one DS to another GH #1540
[ https://issues.apache.org/jira/browse/TC-336?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16135821#comment-16135821 ] ASF GitHub Bot commented on TC-336: --- Github user mitchell852 commented on a diff in the pull request: https://github.com/apache/incubator-trafficcontrol/pull/790#discussion_r134331397 --- Diff: traffic_portal/app/src/modules/private/configure/deliveryServices/urlSigKeys/deliveryServiceUrlSigKeys.tpl.html --- @@ -0,0 +1,55 @@ + + + + + + + + Delivery Services + {{::deliveryService.displayName}} + URL Sig Keys + + + Generate URL Sig Keys --- End diff -- you don't need to wrap your button labels in , it makes the fonts look different fyi > Add ability to copy url_sig keys from one DS to another GH #1540 > > > Key: TC-336 > URL: https://issues.apache.org/jira/browse/TC-336 > Project: Traffic Control > Issue Type: Improvement > Components: Traffic Ops, Traffic Vault >Reporter: Dewayne Richardson >Assignee: Dylan Volz >Priority: Minor > Labels: keys, url_signing > > There are some cases where we want to use the same URL sig keys for multiple > delivery services. Currently this is handled by using cURL and other manual > processes. Traffic Ops should support the ability to copy url sig keys from > one DS to another. When this happens Traffic Ops should also create the > necessary parameters for the target DS so that URL signing works. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (TC-336) Add ability to copy url_sig keys from one DS to another GH #1540
[ https://issues.apache.org/jira/browse/TC-336?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16135772#comment-16135772 ] ASF GitHub Bot commented on TC-336: --- Github user mitchell852 commented on a diff in the pull request: https://github.com/apache/incubator-trafficcontrol/pull/790#discussion_r134322151 --- Diff: traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js --- @@ -169,9 +169,9 @@ var FormDeliveryServiceController = function(deliveryService, type, types, $scop }; $scope.manageUrlSigKeys = function() { -alert('not hooked up yet: manageUrlSigKeys for DS'); +$location.path($location.path() + '/urlSigKeys'); --- End diff -- can you make this url-sig-keys to match the other urls? > Add ability to copy url_sig keys from one DS to another GH #1540 > > > Key: TC-336 > URL: https://issues.apache.org/jira/browse/TC-336 > Project: Traffic Control > Issue Type: Improvement > Components: Traffic Ops, Traffic Vault >Reporter: Dewayne Richardson >Assignee: Dylan Volz >Priority: Minor > Labels: keys, url_signing > > There are some cases where we want to use the same URL sig keys for multiple > delivery services. Currently this is handled by using cURL and other manual > processes. Traffic Ops should support the ability to copy url sig keys from > one DS to another. When this happens Traffic Ops should also create the > necessary parameters for the target DS so that URL signing works. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (TC-336) Add ability to copy url_sig keys from one DS to another GH #1540
[ https://issues.apache.org/jira/browse/TC-336?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16135773#comment-16135773 ] ASF GitHub Bot commented on TC-336: --- Github user mitchell852 commented on a diff in the pull request: https://github.com/apache/incubator-trafficcontrol/pull/790#discussion_r134324897 --- Diff: traffic_portal/app/src/modules/private/configure/deliveryServices/urlSigKeys/DeliveryServiceUrlSigKeysController.js --- @@ -0,0 +1,100 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +var DeliveryServiceUrlSigKeysController = function(deliveryService, urlSigKeys, $scope, $state, locationUtils, deliveryServiceService, deliveryServiceUrlSigKeysService, $uibModal) { + $scope.deliveryService = deliveryService; + $scope.urlSigKeys = Object.keys(urlSigKeys).map(function(key) { + return {sortBy: parseInt(key.slice(3)), label: key, urlSigKey: urlSigKeys[key]}; + }); + + $scope.generateUrlSigKeys = function() { +var params = { +title: 'Confirmation required', +message: 'Are you sure you want to generate new URL signature keys for ' + deliveryService.displayName + '?' +}; +var modalInstance = $uibModal.open({ +templateUrl: 'common/modules/dialog/confirm/dialog.confirm.tpl.html', +controller: 'DialogConfirmController', +size: 'md', +resolve: { +params: function () { +return params; +} +} +}); +modalInstance.result +.then( +function() { + deliveryServiceUrlSigKeysService.generateUrlSigKeys(deliveryService.xmlId).then( +function() { +$scope.refresh(); +}); +}); + }; + + $scope.refresh = function() { + $state.reload(); // reloads all the resolves for the view + }; + + $scope.selectCopyFromDS = function() { +var params = { +title: 'Copy URL Sig Keys to: ' + deliveryService.displayName, +message: "Please select a Delivery Service to copy from:", +label: "xmlId" +}; +var modalInstance = $uibModal.open({ +templateUrl: 'common/modules/dialog/select/dialog.select.tpl.html', +controller: 'DialogSelectController', +size: 'md', +resolve: { +params: function () { +return params; +}, +collection: function(deliveryServiceService) { +return deliveryServiceService.getDeliveryServices({ signed: true }) +.then(function(result){ + return _.filter(result, function(ds){ + return ds.id !== deliveryService.id; + }) +}); +} +} +}); +modalInstance.result.then(function(copyFromDs) { + deliveryServiceUrlSigKeysService.copyUrlSigKeys(deliveryService.xmlId, copyFromDs.xmlId) +.then( + function() { + $state.reload(); + }); +}); +}; + + $scope.navigateToPath = locationUtils.navigateToPath; + + angular.element(document).ready(function () { + $('#regexesTable').dataTable({ --- End diff -- this id doesn't seem quite right. regexesTable? i know it's arbitrary but you might want to fix that > Add ability to copy url_sig keys from one DS to another GH #1540 > > > Key: TC-336 > URL: https://issues.apache.org/jira/browse/TC-336 >
[jira] [Commented] (TC-336) Add ability to copy url_sig keys from one DS to another GH #1540
[ https://issues.apache.org/jira/browse/TC-336?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16135768#comment-16135768 ] ASF GitHub Bot commented on TC-336: --- Github user mitchell852 commented on a diff in the pull request: https://github.com/apache/incubator-trafficcontrol/pull/790#discussion_r134322763 --- Diff: traffic_ops/app/lib/API/DeliveryService/KeysUrlSig.pm --- @@ -26,6 +26,32 @@ use constant URL_SIG_KEYS_BUCKET => "url_sig_keys"; use Exporter qw(import); our @EXPORT_OK = qw(URL_SIG_KEYS_BUCKET); + +sub view_by_id { + my $self= shift; + my $id = $self->param('id'); + my $rs = $self->db->resultset("Deliveryservice")->find( { id => $id } ); + my $xml_id; + if ( defined($rs) ) { + $xml_id = $rs->xml_id; + } + else { + return $self->alert("Delivery Service '$id' does not exist."); + } + --- End diff -- can you add a tenant check in here similar to this: https://github.com/apache/incubator-trafficcontrol/blob/master/traffic_ops/app/lib/API/Deliveryservice.pm#L175 going forward, anything ds related needs to check that the user requesting the ds info has the proper tenant to do so. > Add ability to copy url_sig keys from one DS to another GH #1540 > > > Key: TC-336 > URL: https://issues.apache.org/jira/browse/TC-336 > Project: Traffic Control > Issue Type: Improvement > Components: Traffic Ops, Traffic Vault >Reporter: Dewayne Richardson >Assignee: Dylan Volz >Priority: Minor > Labels: keys, url_signing > > There are some cases where we want to use the same URL sig keys for multiple > delivery services. Currently this is handled by using cURL and other manual > processes. Traffic Ops should support the ability to copy url sig keys from > one DS to another. When this happens Traffic Ops should also create the > necessary parameters for the target DS so that URL signing works. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (TC-336) Add ability to copy url_sig keys from one DS to another GH #1540
[ https://issues.apache.org/jira/browse/TC-336?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16135769#comment-16135769 ] ASF GitHub Bot commented on TC-336: --- Github user mitchell852 commented on a diff in the pull request: https://github.com/apache/incubator-trafficcontrol/pull/790#discussion_r134323487 --- Diff: traffic_portal/app/src/common/api/DeliveryServiceUrlSigKeysService.js --- @@ -0,0 +1,70 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +var DeliveryServiceUrlSigKeysService = function(locationUtils, messageModel, $http, $q, ENV) { + + this.generateUrlSigKeys = function(dsXmlId) { + var request = $q.defer(); + $http.post(ENV.api['root'] + 'deliveryservices/xmlId/' + dsXmlId + '/urlkeys/generate') + .then( + function(result) { + messageModel.setMessages([ { level: 'success', text: 'URL Sig Keys generated' } ], true); --- End diff -- ideally this would probably show result.data.alerts so it can show the message sent back from the server rather than a hardcoded message in the UI. yes, i know, there are lots of instances where the message is hardcoded in the UI. that should be fixed at some point. > Add ability to copy url_sig keys from one DS to another GH #1540 > > > Key: TC-336 > URL: https://issues.apache.org/jira/browse/TC-336 > Project: Traffic Control > Issue Type: Improvement > Components: Traffic Ops, Traffic Vault >Reporter: Dewayne Richardson >Assignee: Dylan Volz >Priority: Minor > Labels: keys, url_signing > > There are some cases where we want to use the same URL sig keys for multiple > delivery services. Currently this is handled by using cURL and other manual > processes. Traffic Ops should support the ability to copy url sig keys from > one DS to another. When this happens Traffic Ops should also create the > necessary parameters for the target DS so that URL signing works. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (TC-336) Add ability to copy url_sig keys from one DS to another GH #1540
[ https://issues.apache.org/jira/browse/TC-336?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16135774#comment-16135774 ] ASF GitHub Bot commented on TC-336: --- Github user mitchell852 commented on a diff in the pull request: https://github.com/apache/incubator-trafficcontrol/pull/790#discussion_r134324566 --- Diff: traffic_portal/app/src/modules/private/configure/deliveryServices/urlSigKeys/DeliveryServiceUrlSigKeysController.js --- @@ -0,0 +1,100 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +var DeliveryServiceUrlSigKeysController = function(deliveryService, urlSigKeys, $scope, $state, locationUtils, deliveryServiceService, deliveryServiceUrlSigKeysService, $uibModal) { + $scope.deliveryService = deliveryService; + $scope.urlSigKeys = Object.keys(urlSigKeys).map(function(key) { + return {sortBy: parseInt(key.slice(3)), label: key, urlSigKey: urlSigKeys[key]}; + }); + + $scope.generateUrlSigKeys = function() { +var params = { +title: 'Confirmation required', +message: 'Are you sure you want to generate new URL signature keys for ' + deliveryService.displayName + '?' +}; +var modalInstance = $uibModal.open({ +templateUrl: 'common/modules/dialog/confirm/dialog.confirm.tpl.html', +controller: 'DialogConfirmController', +size: 'md', +resolve: { +params: function () { +return params; +} +} +}); +modalInstance.result +.then( +function() { + deliveryServiceUrlSigKeysService.generateUrlSigKeys(deliveryService.xmlId).then( +function() { +$scope.refresh(); +}); +}); + }; + + $scope.refresh = function() { + $state.reload(); // reloads all the resolves for the view + }; + + $scope.selectCopyFromDS = function() { +var params = { +title: 'Copy URL Sig Keys to: ' + deliveryService.displayName, --- End diff -- again, xml-id rather than displayname? not sure. > Add ability to copy url_sig keys from one DS to another GH #1540 > > > Key: TC-336 > URL: https://issues.apache.org/jira/browse/TC-336 > Project: Traffic Control > Issue Type: Improvement > Components: Traffic Ops, Traffic Vault >Reporter: Dewayne Richardson >Assignee: Dylan Volz >Priority: Minor > Labels: keys, url_signing > > There are some cases where we want to use the same URL sig keys for multiple > delivery services. Currently this is handled by using cURL and other manual > processes. Traffic Ops should support the ability to copy url sig keys from > one DS to another. When this happens Traffic Ops should also create the > necessary parameters for the target DS so that URL signing works. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (TC-336) Add ability to copy url_sig keys from one DS to another GH #1540
[ https://issues.apache.org/jira/browse/TC-336?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16135770#comment-16135770 ] ASF GitHub Bot commented on TC-336: --- Github user mitchell852 commented on a diff in the pull request: https://github.com/apache/incubator-trafficcontrol/pull/790#discussion_r134324745 --- Diff: traffic_portal/app/src/modules/private/configure/deliveryServices/urlSigKeys/DeliveryServiceUrlSigKeysController.js --- @@ -0,0 +1,100 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +var DeliveryServiceUrlSigKeysController = function(deliveryService, urlSigKeys, $scope, $state, locationUtils, deliveryServiceService, deliveryServiceUrlSigKeysService, $uibModal) { + $scope.deliveryService = deliveryService; + $scope.urlSigKeys = Object.keys(urlSigKeys).map(function(key) { + return {sortBy: parseInt(key.slice(3)), label: key, urlSigKey: urlSigKeys[key]}; + }); + + $scope.generateUrlSigKeys = function() { +var params = { +title: 'Confirmation required', +message: 'Are you sure you want to generate new URL signature keys for ' + deliveryService.displayName + '?' +}; +var modalInstance = $uibModal.open({ +templateUrl: 'common/modules/dialog/confirm/dialog.confirm.tpl.html', +controller: 'DialogConfirmController', +size: 'md', +resolve: { +params: function () { +return params; +} +} +}); +modalInstance.result +.then( +function() { + deliveryServiceUrlSigKeysService.generateUrlSigKeys(deliveryService.xmlId).then( +function() { +$scope.refresh(); +}); +}); + }; + + $scope.refresh = function() { + $state.reload(); // reloads all the resolves for the view + }; + + $scope.selectCopyFromDS = function() { +var params = { +title: 'Copy URL Sig Keys to: ' + deliveryService.displayName, +message: "Please select a Delivery Service to copy from:", +label: "xmlId" +}; +var modalInstance = $uibModal.open({ +templateUrl: 'common/modules/dialog/select/dialog.select.tpl.html', +controller: 'DialogSelectController', +size: 'md', +resolve: { +params: function () { +return params; +}, +collection: function(deliveryServiceService) { +return deliveryServiceService.getDeliveryServices({ signed: true }) +.then(function(result){ + return _.filter(result, function(ds){ + return ds.id !== deliveryService.id; --- End diff -- a simple comment might be helpful "you can't copy url sig key from yourself" or something like that > Add ability to copy url_sig keys from one DS to another GH #1540 > > > Key: TC-336 > URL: https://issues.apache.org/jira/browse/TC-336 > Project: Traffic Control > Issue Type: Improvement > Components: Traffic Ops, Traffic Vault >Reporter: Dewayne Richardson >Assignee: Dylan Volz >Priority: Minor > Labels: keys, url_signing > > There are some cases where we want to use the same URL sig keys for multiple > delivery services. Currently this is handled by using cURL and other manual > processes. Traffic Ops should support the ability to copy url sig keys from > one DS to another. When this happens Traffic Ops should also create the > necessary parameters for the target DS so that URL
[jira] [Commented] (TC-336) Add ability to copy url_sig keys from one DS to another GH #1540
[ https://issues.apache.org/jira/browse/TC-336?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16135766#comment-16135766 ] ASF GitHub Bot commented on TC-336: --- Github user mitchell852 commented on a diff in the pull request: https://github.com/apache/incubator-trafficcontrol/pull/790#discussion_r134325053 --- Diff: traffic_portal/app/src/modules/private/configure/deliveryServices/urlSigKeys/index.js --- @@ -0,0 +1,43 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +module.exports = angular.module('trafficPortal.private.configure.deliveryServices.urlSigKeys', []) + .controller('DeliveryServiceUrlSigKeysController', require('./DeliveryServiceUrlSigKeysController')) + .config(function($stateProvider, $urlRouterProvider) { + $stateProvider + .state('trafficPortal.private.configure.deliveryServices.urlSigKeys', { + url: '/{deliveryServiceId}/urlSigKeys', + views: { + deliveryServicesContent: { + templateUrl: 'modules/private/configure/deliveryServices/urlSigKeys/deliveryServiceUrlSigKeys.tpl.html', + controller: 'DeliveryServiceUrlSigKeysController' + } + }, + resolve: { + deliveryService: function($stateParams, deliveryServiceService) { --- End diff -- formatting looks a bit off here > Add ability to copy url_sig keys from one DS to another GH #1540 > > > Key: TC-336 > URL: https://issues.apache.org/jira/browse/TC-336 > Project: Traffic Control > Issue Type: Improvement > Components: Traffic Ops, Traffic Vault >Reporter: Dewayne Richardson >Assignee: Dylan Volz >Priority: Minor > Labels: keys, url_signing > > There are some cases where we want to use the same URL sig keys for multiple > delivery services. Currently this is handled by using cURL and other manual > processes. Traffic Ops should support the ability to copy url sig keys from > one DS to another. When this happens Traffic Ops should also create the > necessary parameters for the target DS so that URL signing works. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (TC-336) Add ability to copy url_sig keys from one DS to another GH #1540
[ https://issues.apache.org/jira/browse/TC-336?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16135775#comment-16135775 ] ASF GitHub Bot commented on TC-336: --- Github user mitchell852 commented on a diff in the pull request: https://github.com/apache/incubator-trafficcontrol/pull/790#discussion_r134324990 --- Diff: traffic_portal/app/src/modules/private/configure/deliveryServices/urlSigKeys/index.js --- @@ -0,0 +1,43 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +module.exports = angular.module('trafficPortal.private.configure.deliveryServices.urlSigKeys', []) + .controller('DeliveryServiceUrlSigKeysController', require('./DeliveryServiceUrlSigKeysController')) + .config(function($stateProvider, $urlRouterProvider) { + $stateProvider + .state('trafficPortal.private.configure.deliveryServices.urlSigKeys', { + url: '/{deliveryServiceId}/urlSigKeys', --- End diff -- url-sig-keys > Add ability to copy url_sig keys from one DS to another GH #1540 > > > Key: TC-336 > URL: https://issues.apache.org/jira/browse/TC-336 > Project: Traffic Control > Issue Type: Improvement > Components: Traffic Ops, Traffic Vault >Reporter: Dewayne Richardson >Assignee: Dylan Volz >Priority: Minor > Labels: keys, url_signing > > There are some cases where we want to use the same URL sig keys for multiple > delivery services. Currently this is handled by using cURL and other manual > processes. Traffic Ops should support the ability to copy url sig keys from > one DS to another. When this happens Traffic Ops should also create the > necessary parameters for the target DS so that URL signing works. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (TC-336) Add ability to copy url_sig keys from one DS to another GH #1540
[ https://issues.apache.org/jira/browse/TC-336?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16135765#comment-16135765 ] ASF GitHub Bot commented on TC-336: --- Github user mitchell852 commented on a diff in the pull request: https://github.com/apache/incubator-trafficcontrol/pull/790#discussion_r134324451 --- Diff: traffic_portal/app/src/modules/private/configure/deliveryServices/urlSigKeys/DeliveryServiceUrlSigKeysController.js --- @@ -0,0 +1,100 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +var DeliveryServiceUrlSigKeysController = function(deliveryService, urlSigKeys, $scope, $state, locationUtils, deliveryServiceService, deliveryServiceUrlSigKeysService, $uibModal) { + $scope.deliveryService = deliveryService; + $scope.urlSigKeys = Object.keys(urlSigKeys).map(function(key) { + return {sortBy: parseInt(key.slice(3)), label: key, urlSigKey: urlSigKeys[key]}; + }); + + $scope.generateUrlSigKeys = function() { +var params = { +title: 'Confirmation required', +message: 'Are you sure you want to generate new URL signature keys for ' + deliveryService.displayName + '?' --- End diff -- kinda thinking xml-id might be best here...seems like people associate more with the xml-id and displayname can get long and end up wrapping... but your call > Add ability to copy url_sig keys from one DS to another GH #1540 > > > Key: TC-336 > URL: https://issues.apache.org/jira/browse/TC-336 > Project: Traffic Control > Issue Type: Improvement > Components: Traffic Ops, Traffic Vault >Reporter: Dewayne Richardson >Assignee: Dylan Volz >Priority: Minor > Labels: keys, url_signing > > There are some cases where we want to use the same URL sig keys for multiple > delivery services. Currently this is handled by using cURL and other manual > processes. Traffic Ops should support the ability to copy url sig keys from > one DS to another. When this happens Traffic Ops should also create the > necessary parameters for the target DS so that URL signing works. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (TC-336) Add ability to copy url_sig keys from one DS to another GH #1540
[ https://issues.apache.org/jira/browse/TC-336?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16127801#comment-16127801 ] ASF GitHub Bot commented on TC-336: --- Github user asfgit commented on the issue: https://github.com/apache/incubator-trafficcontrol/pull/790 Refer to this link for build results (access rights to CI server needed): https://builds.apache.org/job/incubator-trafficcontrol-PR-trafficops-test/9/ > Add ability to copy url_sig keys from one DS to another GH #1540 > > > Key: TC-336 > URL: https://issues.apache.org/jira/browse/TC-336 > Project: Traffic Control > Issue Type: Improvement > Components: Traffic Ops, Traffic Vault >Reporter: Dewayne Richardson >Assignee: Dylan Volz >Priority: Minor > Labels: keys, url_signing > > There are some cases where we want to use the same URL sig keys for multiple > delivery services. Currently this is handled by using cURL and other manual > processes. Traffic Ops should support the ability to copy url sig keys from > one DS to another. When this happens Traffic Ops should also create the > necessary parameters for the target DS so that URL signing works. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (TC-336) Add ability to copy url_sig keys from one DS to another GH #1540
[ https://issues.apache.org/jira/browse/TC-336?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16125641#comment-16125641 ] ASF GitHub Bot commented on TC-336: --- Github user asfgit commented on the issue: https://github.com/apache/incubator-trafficcontrol/pull/790 Can one of the admins verify this patch? > Add ability to copy url_sig keys from one DS to another GH #1540 > > > Key: TC-336 > URL: https://issues.apache.org/jira/browse/TC-336 > Project: Traffic Control > Issue Type: Improvement > Components: Traffic Ops, Traffic Vault >Reporter: Dewayne Richardson >Assignee: Dylan Volz >Priority: Minor > Labels: keys, url_signing > > There are some cases where we want to use the same URL sig keys for multiple > delivery services. Currently this is handled by using cURL and other manual > processes. Traffic Ops should support the ability to copy url sig keys from > one DS to another. When this happens Traffic Ops should also create the > necessary parameters for the target DS so that URL signing works. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (TC-336) Add ability to copy url_sig keys from one DS to another GH #1540
[ https://issues.apache.org/jira/browse/TC-336?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16122005#comment-16122005 ] ASF GitHub Bot commented on TC-336: --- Github user asfgit commented on the issue: https://github.com/apache/incubator-trafficcontrol/pull/790 Refer to this link for build results (access rights to CI server needed): https://builds.apache.org/job/incubator-trafficcontrol-PR/38/ > Add ability to copy url_sig keys from one DS to another GH #1540 > > > Key: TC-336 > URL: https://issues.apache.org/jira/browse/TC-336 > Project: Traffic Control > Issue Type: Improvement > Components: Traffic Ops, Traffic Vault >Reporter: Dewayne Richardson >Assignee: Dylan Volz >Priority: Minor > Labels: keys, url_signing > > There are some cases where we want to use the same URL sig keys for multiple > delivery services. Currently this is handled by using cURL and other manual > processes. Traffic Ops should support the ability to copy url sig keys from > one DS to another. When this happens Traffic Ops should also create the > necessary parameters for the target DS so that URL signing works. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (TC-336) Add ability to copy url_sig keys from one DS to another GH #1540
[ https://issues.apache.org/jira/browse/TC-336?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16121759#comment-16121759 ] ASF GitHub Bot commented on TC-336: --- Github user mitchell852 commented on the issue: https://github.com/apache/incubator-trafficcontrol/pull/790 you might want to consider adding a confirm dialog to the generate button. i.e. "Are you sure you want to generate url sig keys?" - search for dialog.confirm to see other places that use it. > Add ability to copy url_sig keys from one DS to another GH #1540 > > > Key: TC-336 > URL: https://issues.apache.org/jira/browse/TC-336 > Project: Traffic Control > Issue Type: Improvement > Components: Traffic Ops, Traffic Vault >Reporter: Dewayne Richardson >Assignee: Dylan Volz >Priority: Minor > Labels: keys, url_signing > > There are some cases where we want to use the same URL sig keys for multiple > delivery services. Currently this is handled by using cURL and other manual > processes. Traffic Ops should support the ability to copy url sig keys from > one DS to another. When this happens Traffic Ops should also create the > necessary parameters for the target DS so that URL signing works. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (TC-336) Add ability to copy url_sig keys from one DS to another GH #1540
[ https://issues.apache.org/jira/browse/TC-336?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16120343#comment-16120343 ] ASF GitHub Bot commented on TC-336: --- Github user asfgit commented on the issue: https://github.com/apache/incubator-trafficcontrol/pull/790 Refer to this link for build results (access rights to CI server needed): https://builds.apache.org/job/incubator-trafficcontrol-PR/30/ > Add ability to copy url_sig keys from one DS to another GH #1540 > > > Key: TC-336 > URL: https://issues.apache.org/jira/browse/TC-336 > Project: Traffic Control > Issue Type: Improvement > Components: Traffic Ops, Traffic Vault >Reporter: Dewayne Richardson >Assignee: Dylan Volz >Priority: Minor > Labels: keys, url_signing > > There are some cases where we want to use the same URL sig keys for multiple > delivery services. Currently this is handled by using cURL and other manual > processes. Traffic Ops should support the ability to copy url sig keys from > one DS to another. When this happens Traffic Ops should also create the > necessary parameters for the target DS so that URL signing works. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (TC-336) Add ability to copy url_sig keys from one DS to another GH #1540
[ https://issues.apache.org/jira/browse/TC-336?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16110907#comment-16110907 ] ASF GitHub Bot commented on TC-336: --- Github user asfgit closed the pull request at: https://github.com/apache/incubator-trafficcontrol/pull/733 > Add ability to copy url_sig keys from one DS to another GH #1540 > > > Key: TC-336 > URL: https://issues.apache.org/jira/browse/TC-336 > Project: Traffic Control > Issue Type: Improvement > Components: Traffic Ops, Traffic Vault >Reporter: Dewayne Richardson >Assignee: Dylan Volz >Priority: Minor > Labels: keys, url_signing > > There are some cases where we want to use the same URL sig keys for multiple > delivery services. Currently this is handled by using cURL and other manual > processes. Traffic Ops should support the ability to copy url sig keys from > one DS to another. When this happens Traffic Ops should also create the > necessary parameters for the target DS so that URL signing works. -- This message was sent by Atlassian JIRA (v6.4.14#64029)