From d31a7675a562ba81ab79ff4961391bb9a0828b0c Mon Sep 17 00:00:00 2001 From: David Arroyo Cazorla Date: Tue, 22 Nov 2016 12:40:33 +0100 Subject: [PATCH 01/32] add maven-central badge (#3) --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index d734c44..dda25b7 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +[![Maven Central - scala 2.11](https://maven-badges.herokuapp.com/maven-central/com.stratio.crossdata/crossdata-auth-interface_2.11/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.stratio.crossdata/crossdata-auth-interface_2.11) + Description ============ From 25a31bf85323d071fd76aa23c6d6a34e1804db6a Mon Sep 17 00:00:00 2001 From: Javier Delgado Date: Wed, 8 Mar 2017 09:40:32 +0100 Subject: [PATCH 02/32] proper pipeline branch --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index c277fbf..5af608c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -@Library('libpipelines@feature/multibranch') _ +@Library('libpipelines@master') _ hose { EMAIL = 'crossdata' From 1006b6c060cabf9d789e40b2d2dce10e5c01e774 Mon Sep 17 00:00:00 2001 From: Unai Sarasola Date: Thu, 18 May 2017 17:52:02 +0200 Subject: [PATCH 03/32] [CROSSDATA-952] Removed catalog as resource (#4) * Removed catalog as resource * Added as developer * Changelog updated * Database as resource --- CHANGELOG.md | 2 ++ pom.xml | 5 +++++ .../scala/com/stratio/crossdata/security/Resource.scala | 7 ++++--- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 974aca4..b520471 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ ## 0.2.0 (upcoming) * Pending changelog +* Removed catalog as resource +* Added database as resource ## 0.1.0 (November 21, 2016) diff --git a/pom.xml b/pom.xml index f4ab62a..f5e23d0 100644 --- a/pom.xml +++ b/pom.xml @@ -49,6 +49,11 @@ David Arroyo darroyo at stratio dot com + + pianista215 + Unai Sarasola + usarasola at stratio dot com + diff --git a/src/main/scala/com/stratio/crossdata/security/Resource.scala b/src/main/scala/com/stratio/crossdata/security/Resource.scala index b20d8dd..1d5b1f2 100644 --- a/src/main/scala/com/stratio/crossdata/security/Resource.scala +++ b/src/main/scala/com/stratio/crossdata/security/Resource.scala @@ -21,12 +21,13 @@ sealed trait ResourceType{ def name(): String } +case object DatabaseResource extends ResourceType{ + override def name(): String = "database" +} + case object TableResource extends ResourceType{ override def name(): String = "table" } -case object CatalogResource extends ResourceType{ - override def name(): String = "catalog" -} case object DatastoreResource extends ResourceType{ override def name(): String = "datastore" From bdd114aca5227280e44d11c935ecfef311648981 Mon Sep 17 00:00:00 2001 From: Unai Sarasola Date: Fri, 19 May 2017 10:02:59 +0200 Subject: [PATCH 04/32] Updated POM for deploy in Nexus (#5) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f5e23d0..92c9f00 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.stratio parent - 0.8.2 + 0.9.0 com.stratio.crossdata From 80ee6643b23e1445a2e7312641bbac102fbed89d Mon Sep 17 00:00:00 2001 From: Unai Sarasola Date: Wed, 24 May 2017 14:30:42 +0200 Subject: [PATCH 05/32] Removed describe as resource (#6) --- CHANGELOG.md | 1 + src/main/scala/com/stratio/crossdata/security/Action.scala | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b520471..84e4a6f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ * Pending changelog * Removed catalog as resource * Added database as resource +* Removed Describe as action. Now Read is enough to read metadata. ## 0.1.0 (November 21, 2016) diff --git a/src/main/scala/com/stratio/crossdata/security/Action.scala b/src/main/scala/com/stratio/crossdata/security/Action.scala index cf4ef49..1aeaa62 100644 --- a/src/main/scala/com/stratio/crossdata/security/Action.scala +++ b/src/main/scala/com/stratio/crossdata/security/Action.scala @@ -28,6 +28,4 @@ case object Create extends Action case object Drop extends Action -case object Describe extends Action - case object Cache extends Action \ No newline at end of file From 0325e098f26db922532be04587ecbd5ac68d1bda Mon Sep 17 00:00:00 2001 From: Unai Sarasola Date: Fri, 16 Jun 2017 11:53:02 +0200 Subject: [PATCH 06/32] Update Changelog for release --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 84e4a6f..720fc0c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,6 @@ ## 0.2.0 (upcoming) -* Pending changelog * Removed catalog as resource * Added database as resource * Removed Describe as action. Now Read is enough to read metadata. From f9c7371d7449cd9b3f8d084ab7f350d6a1ca49bb Mon Sep 17 00:00:00 2001 From: stratiocommit Date: Fri, 16 Jun 2017 09:54:50 +0000 Subject: [PATCH 07/32] Prepare for next version --- CHANGELOG.md | 4 ++++ pom.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 720fc0c..84589a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 0.3.0 (upcoming) + +* Pending changelog + ## 0.2.0 (upcoming) * Removed catalog as resource diff --git a/pom.xml b/pom.xml index 92c9f00..a9c7942 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ com.stratio.crossdata crossdata-auth-interface_2.11 - 0.2.0-SNAPSHOT + 0.3.0-SNAPSHOT jar Crossdata auth interface Authorization interface for Stratio Crossdata From 6268a708fb32923176a7238c82ffe04409de0974 Mon Sep 17 00:00:00 2001 From: stratiocommit Date: Fri, 16 Jun 2017 10:00:31 +0000 Subject: [PATCH 08/32] Noting 0.2.0 release date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 84589a9..687f03f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ * Pending changelog -## 0.2.0 (upcoming) +## 0.2.0 (June 16, 2017) * Removed catalog as resource * Added database as resource From 4be6ea8b978a3ade6361d9d3ded403fb7288f77d Mon Sep 17 00:00:00 2001 From: Unai Sarasola Date: Mon, 19 Jun 2017 09:59:11 +0200 Subject: [PATCH 09/32] Deploy to maven central fix in Jenkins (#7) --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 5af608c..e7ea911 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,6 +9,7 @@ hose { REPOSITORY = 'crossdata-auth-interface' DEV = { config -> + doPackage(config) doDeploy(config) } } From ae808fdfe59696b4a1a1f690ea7cce7839b06636 Mon Sep 17 00:00:00 2001 From: Miguel Angel Fernandez Diaz Date: Thu, 14 Sep 2017 15:00:00 +0200 Subject: [PATCH 10/32] [CROSSDATA-1202] New license (#12) --- LICENSE | 203 +----------------- README.md | 18 +- pom.xml | 8 + .../stratio/crossdata/security/Action.scala | 14 +- .../crossdata/security/AuditEvent.scala | 14 +- .../security/CrossdataSecurityManager.scala | 14 +- .../stratio/crossdata/security/Resource.scala | 14 +- .../stratio/crossdata/security/Result.scala | 14 +- 8 files changed, 22 insertions(+), 277 deletions(-) diff --git a/LICENSE b/LICENSE index d645695..d1215a0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,202 +1,3 @@ +© 2017 Stratio Big Data Inc., Sucursal en España. All rights reserved. - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed 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. +This software – including all its source code – contains proprietary information of Stratio Big Data Inc., Sucursal en España and may not be revealed, sold, transferred, modified, distributed or otherwise made available, licensed or sublicensed to third parties; nor reverse engineered, disassembled or decompiled, without express written authorization from Stratio Big Data Inc., Sucursal en España. diff --git a/README.md b/README.md index dda25b7..41e66f9 100644 --- a/README.md +++ b/README.md @@ -9,20 +9,6 @@ Authorization interface for [Stratio Crossdata](https://github.com/Stratio/Cross License ======= -Stratio Crossdata is licensed as [Apache2](http://www.apache.org/licenses/LICENSE-2.0.txt) +© 2017 Stratio Big Data Inc., Sucursal en España. All rights reserved. -Licensed to STRATIO (C) under one or more contributor license agreements. -See the NOTICE file distributed with this work for additional information -regarding copyright ownership. The STRATIO (C) 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. +This software – including all its source code – contains proprietary information of Stratio Big Data Inc., Sucursal en España and may not be revealed, sold, transferred, modified, distributed or otherwise made available, licensed or sublicensed to third parties; nor reverse engineered, disassembled or decompiled, without express written authorization from Stratio Big Data Inc., Sucursal en España. diff --git a/pom.xml b/pom.xml index a9c7942..dccbe70 100644 --- a/pom.xml +++ b/pom.xml @@ -119,6 +119,14 @@ com.mycila license-maven-plugin + + SLASHSTAR_STYLE + SLASHSTAR_STYLE + SLASHSTAR_STYLE + JAVADOC_STYLE + SCRIPT_STYLE + +
${license.header}
**/.*/** diff --git a/src/main/scala/com/stratio/crossdata/security/Action.scala b/src/main/scala/com/stratio/crossdata/security/Action.scala index 1aeaa62..f59ac9b 100644 --- a/src/main/scala/com/stratio/crossdata/security/Action.scala +++ b/src/main/scala/com/stratio/crossdata/security/Action.scala @@ -1,17 +1,7 @@ /* - * Copyright (C) 2016 Stratio (http://stratio.com) + * © 2017 Stratio Big Data Inc., Sucursal en España. All rights reserved. * - * Licensed 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. + * This software – including all its source code – contains proprietary information of Stratio Big Data Inc., Sucursal en España and may not be revealed, sold, transferred, modified, distributed or otherwise made available, licensed or sublicensed to third parties; nor reverse engineered, disassembled or decompiled, without express written authorization from Stratio Big Data Inc., Sucursal en España. */ package com.stratio.crossdata.security diff --git a/src/main/scala/com/stratio/crossdata/security/AuditEvent.scala b/src/main/scala/com/stratio/crossdata/security/AuditEvent.scala index f3b1bd5..dfb6428 100644 --- a/src/main/scala/com/stratio/crossdata/security/AuditEvent.scala +++ b/src/main/scala/com/stratio/crossdata/security/AuditEvent.scala @@ -1,17 +1,7 @@ /* - * Copyright (C) 2016 Stratio (http://stratio.com) + * © 2017 Stratio Big Data Inc., Sucursal en España. All rights reserved. * - * Licensed 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. + * This software – including all its source code – contains proprietary information of Stratio Big Data Inc., Sucursal en España and may not be revealed, sold, transferred, modified, distributed or otherwise made available, licensed or sublicensed to third parties; nor reverse engineered, disassembled or decompiled, without express written authorization from Stratio Big Data Inc., Sucursal en España. */ package com.stratio.crossdata.security diff --git a/src/main/scala/com/stratio/crossdata/security/CrossdataSecurityManager.scala b/src/main/scala/com/stratio/crossdata/security/CrossdataSecurityManager.scala index 66402f4..83fc6ba 100644 --- a/src/main/scala/com/stratio/crossdata/security/CrossdataSecurityManager.scala +++ b/src/main/scala/com/stratio/crossdata/security/CrossdataSecurityManager.scala @@ -1,17 +1,7 @@ /* - * Copyright (C) 2016 Stratio (http://stratio.com) + * © 2017 Stratio Big Data Inc., Sucursal en España. All rights reserved. * - * Licensed 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. + * This software – including all its source code – contains proprietary information of Stratio Big Data Inc., Sucursal en España and may not be revealed, sold, transferred, modified, distributed or otherwise made available, licensed or sublicensed to third parties; nor reverse engineered, disassembled or decompiled, without express written authorization from Stratio Big Data Inc., Sucursal en España. */ package com.stratio.crossdata.security diff --git a/src/main/scala/com/stratio/crossdata/security/Resource.scala b/src/main/scala/com/stratio/crossdata/security/Resource.scala index 1d5b1f2..085d87b 100644 --- a/src/main/scala/com/stratio/crossdata/security/Resource.scala +++ b/src/main/scala/com/stratio/crossdata/security/Resource.scala @@ -1,17 +1,7 @@ /* - * Copyright (C) 2016 Stratio (http://stratio.com) + * © 2017 Stratio Big Data Inc., Sucursal en España. All rights reserved. * - * Licensed 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. + * This software – including all its source code – contains proprietary information of Stratio Big Data Inc., Sucursal en España and may not be revealed, sold, transferred, modified, distributed or otherwise made available, licensed or sublicensed to third parties; nor reverse engineered, disassembled or decompiled, without express written authorization from Stratio Big Data Inc., Sucursal en España. */ package com.stratio.crossdata.security diff --git a/src/main/scala/com/stratio/crossdata/security/Result.scala b/src/main/scala/com/stratio/crossdata/security/Result.scala index df46ae6..dacb42b 100644 --- a/src/main/scala/com/stratio/crossdata/security/Result.scala +++ b/src/main/scala/com/stratio/crossdata/security/Result.scala @@ -1,17 +1,7 @@ /* - * Copyright (C) 2016 Stratio (http://stratio.com) + * © 2017 Stratio Big Data Inc., Sucursal en España. All rights reserved. * - * Licensed 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. + * This software – including all its source code – contains proprietary information of Stratio Big Data Inc., Sucursal en España and may not be revealed, sold, transferred, modified, distributed or otherwise made available, licensed or sublicensed to third parties; nor reverse engineered, disassembled or decompiled, without express written authorization from Stratio Big Data Inc., Sucursal en España. */ package com.stratio.crossdata.security From 62735283f1ab80b86e2d3af28889618573c144ae Mon Sep 17 00:00:00 2001 From: "Roque Vassal'lo @ StratioBD" <32131830+rvassallo-stratio@users.noreply.github.com> Date: Fri, 13 Apr 2018 15:15:49 +0200 Subject: [PATCH 11/32] [CROSSDATA-1557] Rows & columns filtering - add new methods, actions and resources - fix developers at pom --- pom.xml | 10 ++++++++++ .../com/stratio/crossdata/security/Action.scala | 4 +++- .../security/CrossdataSecurityManager.scala | 4 ++++ .../com/stratio/crossdata/security/Resource.scala | 12 ++++++++---- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index dccbe70..a88af71 100644 --- a/pom.xml +++ b/pom.xml @@ -54,6 +54,16 @@ Unai Sarasola usarasola at stratio dot com + + mafernandez-stratio + Miguel Angel Fernandez Diaz + mafernandez at stratio dot com + + + rvassallo-stratio + Roque Vassal'lo Saco + rvassallo at stratio dot com + diff --git a/src/main/scala/com/stratio/crossdata/security/Action.scala b/src/main/scala/com/stratio/crossdata/security/Action.scala index f59ac9b..5e05ffd 100644 --- a/src/main/scala/com/stratio/crossdata/security/Action.scala +++ b/src/main/scala/com/stratio/crossdata/security/Action.scala @@ -18,4 +18,6 @@ case object Create extends Action case object Drop extends Action -case object Cache extends Action \ No newline at end of file +case object Cache extends Action + +case object FilterColumn extends Action diff --git a/src/main/scala/com/stratio/crossdata/security/CrossdataSecurityManager.scala b/src/main/scala/com/stratio/crossdata/security/CrossdataSecurityManager.scala index 83fc6ba..f2365f9 100644 --- a/src/main/scala/com/stratio/crossdata/security/CrossdataSecurityManager.scala +++ b/src/main/scala/com/stratio/crossdata/security/CrossdataSecurityManager.scala @@ -15,4 +15,8 @@ trait CrossdataSecurityManager { def audit(auditEvent: AuditEvent): Unit + def filterColumns(userId: String, resources: List[Resource]): List[Resource] + + def filterRows(userId: String, resource: Resource): Option[String] + } \ No newline at end of file diff --git a/src/main/scala/com/stratio/crossdata/security/Resource.scala b/src/main/scala/com/stratio/crossdata/security/Resource.scala index 085d87b..dd0d089 100644 --- a/src/main/scala/com/stratio/crossdata/security/Resource.scala +++ b/src/main/scala/com/stratio/crossdata/security/Resource.scala @@ -7,22 +7,26 @@ package com.stratio.crossdata.security case class Resource(instances: Seq[String], resourceType: ResourceType, name: String) -sealed trait ResourceType{ +sealed trait ResourceType { def name(): String } -case object DatabaseResource extends ResourceType{ +case object DatabaseResource extends ResourceType { override def name(): String = "database" } -case object TableResource extends ResourceType{ +case object TableResource extends ResourceType { override def name(): String = "table" } -case object DatastoreResource extends ResourceType{ +case object DatastoreResource extends ResourceType { override def name(): String = "datastore" } +case object ColumnResource extends ResourceType { + override def name(): String = "column" +} + object Resource { val CrossdataClusterNameEnvVar = "CROSSDATA_CLUSTER_NAME" val AllResourceName = "*" From 05efe91e63a507d833b37455c66b3227aa937ab1 Mon Sep 17 00:00:00 2001 From: "Roque Vassal'lo @ StratioBD" <32131830+rvassallo-stratio@users.noreply.github.com> Date: Thu, 10 May 2018 15:25:35 +0200 Subject: [PATCH 12/32] [CROSSDATA-1613] New versioning style --- .gitignore | 1 + CHANGELOG.md | 3 ++- Jenkinsfile | 2 +- pom.xml | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f8ceb9f..0075642 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ metastore_db/ crossdata-scripts/spark-crossdata-distribution* **/sampledb/** **/dependency-reduced-pom.xml +.flattened-pom.xml diff --git a/CHANGELOG.md b/CHANGELOG.md index 687f03f..8585687 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,8 @@ ## 0.3.0 (upcoming) -* Pending changelog +* Added column as resource +* Added FilterColumn as action ## 0.2.0 (June 16, 2017) diff --git a/Jenkinsfile b/Jenkinsfile index e7ea911..d9f9dde 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,7 +7,7 @@ hose { RELEASETIMEOUT = 20 FOSS = true REPOSITORY = 'crossdata-auth-interface' - + BUILDTOOLVERSION = '3.5.0' DEV = { config -> doPackage(config) doDeploy(config) diff --git a/pom.xml b/pom.xml index a88af71..f8c7945 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.stratio parent - 0.9.0 + 0.10.0 com.stratio.crossdata From 8e89c6b07b1d2f0ede03586cf4fd35b7da6d4814 Mon Sep 17 00:00:00 2001 From: stratiocommit Date: Mon, 14 May 2018 10:16:20 +0000 Subject: [PATCH 13/32] Prepare for next version --- CHANGELOG.md | 4 ++++ pom.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8585687..403b528 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 0.4.0 (upcoming) + +* Pending changelog + ## 0.3.0 (upcoming) * Added column as resource diff --git a/pom.xml b/pom.xml index f8c7945..26c78f0 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ com.stratio.crossdata crossdata-auth-interface_2.11 - 0.3.0-SNAPSHOT + 0.4.0-SNAPSHOT jar Crossdata auth interface Authorization interface for Stratio Crossdata From 28d9f666accff429aed48746f735b184c5567e56 Mon Sep 17 00:00:00 2001 From: "Roque Vassal'lo @ StratioBD" <32131830+rvassallo-stratio@users.noreply.github.com> Date: Mon, 14 May 2018 12:28:55 +0200 Subject: [PATCH 14/32] Activate new versioning (#16) --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index d9f9dde..32f7d33 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,6 +8,7 @@ hose { FOSS = true REPOSITORY = 'crossdata-auth-interface' BUILDTOOLVERSION = '3.5.0' + NEW_VERSIONING = true DEV = { config -> doPackage(config) doDeploy(config) From 3e840af5d41eecb9d8c452f150a063b468803f39 Mon Sep 17 00:00:00 2001 From: stratiocommit Date: Mon, 14 May 2018 10:40:50 +0000 Subject: [PATCH 15/32] [PRE-RELEASE] 0.3.0-b599046: Master change log updated --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 403b528..51fa208 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ * Pending changelog -## 0.3.0 (upcoming) +## 0.3.0-b599046 (Built: May 14, 2018 | Pre-release) * Added column as resource * Added FilterColumn as action From b133360cacd8bcfc152e80119249284149b0a566 Mon Sep 17 00:00:00 2001 From: stratiocommit Date: Mon, 14 May 2018 10:49:26 +0000 Subject: [PATCH 16/32] [RELEASE] 0.3.0: Master change log updated --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 51fa208..36522a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ * Pending changelog -## 0.3.0-b599046 (Built: May 14, 2018 | Pre-release) +## 0.3.0-b599046 (Built: May 14, 2018 | Released: May 14, 2018) * Added column as resource * Added FilterColumn as action From 8224ff3c33d88494cf24f56018b02ab134ede228 Mon Sep 17 00:00:00 2001 From: "Roque Vassal'lo @ StratioBD" <32131830+rvassallo-stratio@users.noreply.github.com> Date: Thu, 24 May 2018 15:40:06 +0200 Subject: [PATCH 17/32] Bump Stratio parent to 0.11.0 (#19) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 26c78f0..6f6ee93 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.stratio parent - 0.10.0 + 0.11.0 com.stratio.crossdata From 5ab630533c027bd3c90b1994157068c12c9c7e92 Mon Sep 17 00:00:00 2001 From: "Roque Vassal'lo @ StratioBD" <32131830+rvassallo-stratio@users.noreply.github.com> Date: Mon, 18 Mar 2019 12:49:34 +0100 Subject: [PATCH 18/32] [CROSSDATA-1921] Add user impersonator resource (#20) --- CHANGELOG.md | 3 ++- src/main/scala/com/stratio/crossdata/security/Action.scala | 2 ++ src/main/scala/com/stratio/crossdata/security/Resource.scala | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 36522a9..9647507 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,8 @@ ## 0.4.0 (upcoming) -* Pending changelog +* Added impersonator as resource +* Added Other as action ## 0.3.0-b599046 (Built: May 14, 2018 | Released: May 14, 2018) diff --git a/src/main/scala/com/stratio/crossdata/security/Action.scala b/src/main/scala/com/stratio/crossdata/security/Action.scala index 5e05ffd..5868194 100644 --- a/src/main/scala/com/stratio/crossdata/security/Action.scala +++ b/src/main/scala/com/stratio/crossdata/security/Action.scala @@ -21,3 +21,5 @@ case object Drop extends Action case object Cache extends Action case object FilterColumn extends Action + +case object Other extends Action diff --git a/src/main/scala/com/stratio/crossdata/security/Resource.scala b/src/main/scala/com/stratio/crossdata/security/Resource.scala index dd0d089..0fc7b5b 100644 --- a/src/main/scala/com/stratio/crossdata/security/Resource.scala +++ b/src/main/scala/com/stratio/crossdata/security/Resource.scala @@ -27,6 +27,10 @@ case object ColumnResource extends ResourceType { override def name(): String = "column" } +case object ServiceImpersonationResource extends ResourceType { + override def name(): String = "impersonator" +} + object Resource { val CrossdataClusterNameEnvVar = "CROSSDATA_CLUSTER_NAME" val AllResourceName = "*" From 15f43afe4dc64a4443b218f5406198821868a6ce Mon Sep 17 00:00:00 2001 From: stratiocommit Date: Mon, 18 Mar 2019 11:59:29 +0000 Subject: [PATCH 19/32] [PRE-RELEASE] 0.4.0-441a52f: CHANGELOG and VERSION_HISTORY updated --- CHANGELOG.md | 6 +++++- VERSION_HISTORY.md | 10 ++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 VERSION_HISTORY.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 9647507..cac1b11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Changelog -## 0.4.0 (upcoming) +## 0.5.0 (upcoming) + +* Pending changelog + +## 0.4.0-441a52f (Built: March 18, 2019 | Pre-release) * Added impersonator as resource * Added Other as action diff --git a/VERSION_HISTORY.md b/VERSION_HISTORY.md new file mode 100644 index 0000000..4c310f9 --- /dev/null +++ b/VERSION_HISTORY.md @@ -0,0 +1,10 @@ +# Version History + + +#### 0.4.0-441a52f (Built: March 18, 2019 | Pre-release) + +#### 0.3.0-b599046 (Built: May 14, 2018 | Released: May 14, 2018) + +#### 0.2.0 (June 16, 2017) + +#### 0.1.0 (November 21, 2016) \ No newline at end of file From b4979bd9cdd56dbfa8c45a1d99f527c03da1ed6f Mon Sep 17 00:00:00 2001 From: stratiocommit Date: Mon, 18 Mar 2019 12:01:03 +0000 Subject: [PATCH 20/32] Prepare for next version: 0.5.0-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6f6ee93..17b1606 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ com.stratio.crossdata crossdata-auth-interface_2.11 - 0.4.0-SNAPSHOT + 0.5.0-SNAPSHOT jar Crossdata auth interface Authorization interface for Stratio Crossdata From befc057c22d1d2d245e69e3a606edea8dcc2b7c4 Mon Sep 17 00:00:00 2001 From: stratiocommit Date: Wed, 22 May 2019 12:02:08 +0000 Subject: [PATCH 21/32] [RELEASE] 0.4.0: Master branch updated --- CHANGELOG.md | 2 +- VERSION_HISTORY.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cac1b11..125d3d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ * Pending changelog -## 0.4.0-441a52f (Built: March 18, 2019 | Pre-release) +## 0.4.0-441a52f (Built: March 18, 2019 | Released: May 22, 2019) * Added impersonator as resource * Added Other as action diff --git a/VERSION_HISTORY.md b/VERSION_HISTORY.md index 4c310f9..ae498c7 100644 --- a/VERSION_HISTORY.md +++ b/VERSION_HISTORY.md @@ -1,7 +1,7 @@ # Version History -#### 0.4.0-441a52f (Built: March 18, 2019 | Pre-release) +#### 0.4.0-441a52f (Built: March 18, 2019 | Released: May 22, 2019) #### 0.3.0-b599046 (Built: May 14, 2018 | Released: May 14, 2018) From c5e9b3e530af3f18b5d7a80b0b36f9f602f5af5e Mon Sep 17 00:00:00 2001 From: "Roque Vassal'lo @ StratioBD" <32131830+rvassallo-stratio@users.noreply.github.com> Date: Wed, 22 May 2019 14:22:36 +0200 Subject: [PATCH 22/32] [CROSSDATA-2019] Add bind as action (#21) --- CHANGELOG.md | 2 +- src/main/scala/com/stratio/crossdata/security/Action.scala | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 125d3d3..6d491ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## 0.5.0 (upcoming) -* Pending changelog +* Added Bind as action ## 0.4.0-441a52f (Built: March 18, 2019 | Released: May 22, 2019) diff --git a/src/main/scala/com/stratio/crossdata/security/Action.scala b/src/main/scala/com/stratio/crossdata/security/Action.scala index 5868194..0afa8e5 100644 --- a/src/main/scala/com/stratio/crossdata/security/Action.scala +++ b/src/main/scala/com/stratio/crossdata/security/Action.scala @@ -20,6 +20,8 @@ case object Drop extends Action case object Cache extends Action +case object Bind extends Action + case object FilterColumn extends Action case object Other extends Action From d72ab466c08b69be9ec256fd39b8df7a7ba7cbce Mon Sep 17 00:00:00 2001 From: stratiocommit Date: Wed, 22 May 2019 12:25:45 +0000 Subject: [PATCH 23/32] [PRE-RELEASE] 0.5.0-4a78288: CHANGELOG and VERSION_HISTORY updated --- CHANGELOG.md | 6 +++++- VERSION_HISTORY.md | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d491ef..38f7954 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Changelog -## 0.5.0 (upcoming) +## 0.6.0 (upcoming) + +* Pending changelog + +## 0.5.0-4a78288 (Built: May 22, 2019 | Pre-release) * Added Bind as action diff --git a/VERSION_HISTORY.md b/VERSION_HISTORY.md index ae498c7..1c46050 100644 --- a/VERSION_HISTORY.md +++ b/VERSION_HISTORY.md @@ -1,6 +1,8 @@ # Version History +#### 0.5.0-4a78288 (Built: May 22, 2019 | Pre-release) + #### 0.4.0-441a52f (Built: March 18, 2019 | Released: May 22, 2019) #### 0.3.0-b599046 (Built: May 14, 2018 | Released: May 14, 2018) From 743ab4c4017a9859fb08ca3b5dea6d9dd15a92c5 Mon Sep 17 00:00:00 2001 From: stratiocommit Date: Wed, 22 May 2019 12:28:15 +0000 Subject: [PATCH 24/32] Prepare for next version: 0.6.0-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 17b1606..ec21234 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ com.stratio.crossdata crossdata-auth-interface_2.11 - 0.5.0-SNAPSHOT + 0.6.0-SNAPSHOT jar Crossdata auth interface Authorization interface for Stratio Crossdata From 3edbe7805b0125921f608ae5dc752397962fbf12 Mon Sep 17 00:00:00 2001 From: stratiocommit Date: Wed, 22 May 2019 12:41:23 +0000 Subject: [PATCH 25/32] [RELEASE] 0.5.0: Master branch updated --- CHANGELOG.md | 2 +- VERSION_HISTORY.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 38f7954..66256c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ * Pending changelog -## 0.5.0-4a78288 (Built: May 22, 2019 | Pre-release) +## 0.5.0-4a78288 (Built: May 22, 2019 | Released: May 22, 2019) * Added Bind as action diff --git a/VERSION_HISTORY.md b/VERSION_HISTORY.md index 1c46050..b36c82a 100644 --- a/VERSION_HISTORY.md +++ b/VERSION_HISTORY.md @@ -1,7 +1,7 @@ # Version History -#### 0.5.0-4a78288 (Built: May 22, 2019 | Pre-release) +#### 0.5.0-4a78288 (Built: May 22, 2019 | Released: May 22, 2019) #### 0.4.0-441a52f (Built: March 18, 2019 | Released: May 22, 2019) From 64d274934c9e8a05cd23d1d2952c3d4b9b2d9d52 Mon Sep 17 00:00:00 2001 From: Juan Miguel Boyero Corral <38220266+jmboyero-stratio@users.noreply.github.com> Date: Fri, 31 May 2019 14:32:47 +0200 Subject: [PATCH 26/32] [CROSSDATA-2078] Avoid upload artifacts to the FTP (#22) --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 32f7d33..e4830c3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,6 +9,7 @@ hose { REPOSITORY = 'crossdata-auth-interface' BUILDTOOLVERSION = '3.5.0' NEW_VERSIONING = true + SFTP_UPLOAD_SKIP = true DEV = { config -> doPackage(config) doDeploy(config) From f72192108c531c9627f41030efbe0d73a17fdf2d Mon Sep 17 00:00:00 2001 From: Miguel Angel Fernandez Diaz Date: Tue, 1 Oct 2019 09:17:20 +0200 Subject: [PATCH 27/32] [CROSSDATA-2066] Add function resource (#24) --- CHANGELOG.md | 2 +- Jenkinsfile | 1 + src/main/scala/com/stratio/crossdata/security/Resource.scala | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66256c5..b63e820 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## 0.6.0 (upcoming) -* Pending changelog +* Added function as resource ## 0.5.0-4a78288 (Built: May 22, 2019 | Released: May 22, 2019) diff --git a/Jenkinsfile b/Jenkinsfile index e4830c3..b114323 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,6 +9,7 @@ hose { REPOSITORY = 'crossdata-auth-interface' BUILDTOOLVERSION = '3.5.0' NEW_VERSIONING = true + DEPLOYONPRS = false SFTP_UPLOAD_SKIP = true DEV = { config -> doPackage(config) diff --git a/src/main/scala/com/stratio/crossdata/security/Resource.scala b/src/main/scala/com/stratio/crossdata/security/Resource.scala index 0fc7b5b..31d20f3 100644 --- a/src/main/scala/com/stratio/crossdata/security/Resource.scala +++ b/src/main/scala/com/stratio/crossdata/security/Resource.scala @@ -19,6 +19,10 @@ case object TableResource extends ResourceType { override def name(): String = "table" } +case object FunctionResource extends ResourceType { + override def name(): String = "function" +} + case object DatastoreResource extends ResourceType { override def name(): String = "datastore" } From a7ba5c9eb1da16a7cdaff6953132ca7e98159ad6 Mon Sep 17 00:00:00 2001 From: jrperez-stratio <38433258+jrperez-stratio@users.noreply.github.com> Date: Thu, 13 Feb 2020 14:44:04 +0100 Subject: [PATCH 28/32] [CROSSDATA-2427] Renamed function resource as udf (#26) --- CHANGELOG.md | 2 +- src/main/scala/com/stratio/crossdata/security/Resource.scala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b63e820..309cdb7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## 0.6.0 (upcoming) -* Added function as resource +* Added udf as resource ## 0.5.0-4a78288 (Built: May 22, 2019 | Released: May 22, 2019) diff --git a/src/main/scala/com/stratio/crossdata/security/Resource.scala b/src/main/scala/com/stratio/crossdata/security/Resource.scala index 31d20f3..52b5b72 100644 --- a/src/main/scala/com/stratio/crossdata/security/Resource.scala +++ b/src/main/scala/com/stratio/crossdata/security/Resource.scala @@ -19,8 +19,8 @@ case object TableResource extends ResourceType { override def name(): String = "table" } -case object FunctionResource extends ResourceType { - override def name(): String = "function" +case object UdfResource extends ResourceType { + override def name(): String = "udf" } case object DatastoreResource extends ResourceType { From a4929ca006ecece6c272af231dcc2734e3819298 Mon Sep 17 00:00:00 2001 From: jrperez-stratio <38433258+jrperez-stratio@users.noreply.github.com> Date: Fri, 14 Feb 2020 08:40:08 +0100 Subject: [PATCH 29/32] [CROSSDATA-2427] Updated jenkins file (#27) --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index b114323..a7cc3fe 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,7 +2,7 @@ hose { EMAIL = 'crossdata' - MODULE = 'crossdata-auth' + MODULE = 'crossdata-auth-interface' DEVTIMEOUT = 20 RELEASETIMEOUT = 20 FOSS = true From ab22c52c91010ed8ae5edc8d105acd566bc589b3 Mon Sep 17 00:00:00 2001 From: stratiocommit Date: Fri, 14 Feb 2020 08:07:15 +0000 Subject: [PATCH 30/32] [PRE-RELEASE] 0.6.0-92d5522: CHANGELOG and VERSION_HISTORY updated --- CHANGELOG.md | 6 +++++- VERSION_HISTORY.md | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 309cdb7..79cbad5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Changelog -## 0.6.0 (upcoming) +## 0.7.0 (upcoming) + +* Pending changelog + +## 0.6.0-92d5522 (Built: February 14, 2020 | Pre-release) * Added udf as resource diff --git a/VERSION_HISTORY.md b/VERSION_HISTORY.md index b36c82a..83aecf8 100644 --- a/VERSION_HISTORY.md +++ b/VERSION_HISTORY.md @@ -1,6 +1,8 @@ # Version History +#### 0.6.0-92d5522 (Built: February 14, 2020 | Pre-release) + #### 0.5.0-4a78288 (Built: May 22, 2019 | Released: May 22, 2019) #### 0.4.0-441a52f (Built: March 18, 2019 | Released: May 22, 2019) From a977d1da2bdbd85772b48478ce9ec1d46479709b Mon Sep 17 00:00:00 2001 From: stratiocommit Date: Fri, 14 Feb 2020 08:09:49 +0000 Subject: [PATCH 31/32] Prepare for next version: 0.7.0-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ec21234..762d0b4 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ com.stratio.crossdata crossdata-auth-interface_2.11 - 0.6.0-SNAPSHOT + 0.7.0-SNAPSHOT jar Crossdata auth interface Authorization interface for Stratio Crossdata From a87ba6f908ac4f7b801e4ab258118444b718a75f Mon Sep 17 00:00:00 2001 From: msastre-stratio Date: Wed, 22 Jul 2020 12:52:29 +0200 Subject: [PATCH 32/32] Upgrade scala version to 2.12 --- Jenkinsfile | 2 +- pom.xml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a7cc3fe..6889455 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,7 @@ hose { REPOSITORY = 'crossdata-auth-interface' BUILDTOOLVERSION = '3.5.0' NEW_VERSIONING = true - DEPLOYONPRS = false + DEPLOYONPRS = true SFTP_UPLOAD_SKIP = true DEV = { config -> doPackage(config) diff --git a/pom.xml b/pom.xml index 762d0b4..063cda7 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ com.stratio.crossdata - crossdata-auth-interface_2.11 + crossdata-auth-interface_2.12 0.7.0-SNAPSHOT jar Crossdata auth interface @@ -71,11 +71,11 @@ UTF-8 stratio-crossdata - 2.11 - 2.11.8 - 2.11.8 - 2.11 - ${scala_2.11.version} + 2.12 + 2.12.10 + 2.12.10 + 2.12 + ${scala_2.12.version}