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 974aca4..79cbad5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,33 @@ # Changelog -## 0.2.0 (upcoming) +## 0.7.0 (upcoming) * Pending changelog +## 0.6.0-92d5522 (Built: February 14, 2020 | Pre-release) + +* Added udf as resource + +## 0.5.0-4a78288 (Built: May 22, 2019 | Released: May 22, 2019) + +* Added Bind as action + +## 0.4.0-441a52f (Built: March 18, 2019 | Released: May 22, 2019) + +* Added impersonator as resource +* Added Other as action + +## 0.3.0-b599046 (Built: May 14, 2018 | Released: May 14, 2018) + +* Added column as resource +* Added FilterColumn as action + +## 0.2.0 (June 16, 2017) + +* 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) * Authorization interface: users are authorized to execute actions on resources diff --git a/Jenkinsfile b/Jenkinsfile index c277fbf..6889455 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,14 +1,18 @@ -@Library('libpipelines@feature/multibranch') _ +@Library('libpipelines@master') _ hose { EMAIL = 'crossdata' - MODULE = 'crossdata-auth' + MODULE = 'crossdata-auth-interface' DEVTIMEOUT = 20 RELEASETIMEOUT = 20 FOSS = true REPOSITORY = 'crossdata-auth-interface' - + BUILDTOOLVERSION = '3.5.0' + NEW_VERSIONING = true + DEPLOYONPRS = true + SFTP_UPLOAD_SKIP = true DEV = { config -> + doPackage(config) doDeploy(config) } } 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 d734c44..41e66f9 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 ============ @@ -7,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) - -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 +© 2017 Stratio Big Data Inc., Sucursal en España. All rights reserved. -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/VERSION_HISTORY.md b/VERSION_HISTORY.md new file mode 100644 index 0000000..83aecf8 --- /dev/null +++ b/VERSION_HISTORY.md @@ -0,0 +1,14 @@ +# 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) + +#### 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 diff --git a/pom.xml b/pom.xml index f4ab62a..063cda7 100644 --- a/pom.xml +++ b/pom.xml @@ -23,12 +23,12 @@ com.stratio parent - 0.8.2 + 0.11.0 com.stratio.crossdata - crossdata-auth-interface_2.11 - 0.2.0-SNAPSHOT + crossdata-auth-interface_2.12 + 0.7.0-SNAPSHOT jar Crossdata auth interface Authorization interface for Stratio Crossdata @@ -49,6 +49,21 @@ David Arroyo darroyo at stratio dot com + + pianista215 + 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 + @@ -56,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} @@ -114,6 +129,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 cf4ef49..0afa8e5 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 @@ -28,6 +18,10 @@ case object Create extends Action case object Drop extends Action -case object Describe extends Action +case object Cache extends Action + +case object Bind extends Action + +case object FilterColumn extends Action -case object Cache extends Action \ No newline at end of file +case object Other extends Action 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..f2365f9 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 @@ -25,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 b20d8dd..52b5b72 100644 --- a/src/main/scala/com/stratio/crossdata/security/Resource.scala +++ b/src/main/scala/com/stratio/crossdata/security/Resource.scala @@ -1,37 +1,40 @@ /* - * 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 case class Resource(instances: Seq[String], resourceType: ResourceType, name: String) -sealed trait ResourceType{ +sealed trait ResourceType { def name(): String } -case object TableResource extends ResourceType{ +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 UdfResource extends ResourceType { + override def name(): String = "udf" } -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" +} + +case object ServiceImpersonationResource extends ResourceType { + override def name(): String = "impersonator" +} + object Resource { val CrossdataClusterNameEnvVar = "CROSSDATA_CLUSTER_NAME" val AllResourceName = "*" 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