Repository: incubator-ranger Updated Branches: refs/heads/master b19fd5bf0 -> cdcb1c049
RANGER-461: added apache2 headers Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/cdcb1c04 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/cdcb1c04 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/cdcb1c04 Branch: refs/heads/master Commit: cdcb1c049ea838184f0dfd70cacc6f835062401d Parents: b19fd5b Author: sneethiraj <[email protected]> Authored: Thu May 7 10:13:10 2015 -0700 Committer: sneethiraj <[email protected]> Committed: Thu May 7 10:13:10 2015 -0700 ---------------------------------------------------------------------- .../ranger/plugin/util/KeySearchFilter.java | 19 ++++++++++++++++++ kms/scripts/db/oracle/kms_core_db_oracle.sql | 16 ++++++++++++++- .../db/postgres/kms_core_db_postgres.sql | 15 ++++++++++++++ .../db/sqlserver/kms_core_db_sqlserver.sql | 16 ++++++++++++++- kms/scripts/update_property.py | 16 +++++++++++++++ pom.xml | 4 ++-- security-admin/scripts/upgrade_admin.py | 14 +++++++++++++ .../java/org/apache/ranger/biz/KmsKeyMgr.java | 19 ++++++++++++++++++ .../java/org/apache/ranger/rest/XKeyREST.java | 18 +++++++++++++++++ .../handler/RangerAuthenticationProvider.java | 21 +++++++++++++++++++- 10 files changed, 153 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/cdcb1c04/agents-common/src/main/java/org/apache/ranger/plugin/util/KeySearchFilter.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/KeySearchFilter.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/KeySearchFilter.java index f28a46b..b9a116e 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/util/KeySearchFilter.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/KeySearchFilter.java @@ -1,3 +1,22 @@ +/* + * 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. + */ + package org.apache.ranger.plugin.util; import java.util.HashMap; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/cdcb1c04/kms/scripts/db/oracle/kms_core_db_oracle.sql ---------------------------------------------------------------------- diff --git a/kms/scripts/db/oracle/kms_core_db_oracle.sql b/kms/scripts/db/oracle/kms_core_db_oracle.sql index bb43d18..fd8b0e4 100644 --- a/kms/scripts/db/oracle/kms_core_db_oracle.sql +++ b/kms/scripts/db/oracle/kms_core_db_oracle.sql @@ -1,3 +1,17 @@ +-- 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. / CREATE SEQUENCE RANGER_MASTERKEY_SEQ START WITH 1 INCREMENT BY 1 NOCACHE NOCYCLE; CREATE TABLE ranger_masterkey ( @@ -28,4 +42,4 @@ kms_version NUMBER(20) DEFAULT NULL NULL, kms_attributes VARCHAR(1024) DEFAULT NULL NULL, kms_encoded VARCHAR(2048), PRIMARY KEY (id) -); \ No newline at end of file +); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/cdcb1c04/kms/scripts/db/postgres/kms_core_db_postgres.sql ---------------------------------------------------------------------- diff --git a/kms/scripts/db/postgres/kms_core_db_postgres.sql b/kms/scripts/db/postgres/kms_core_db_postgres.sql index 19c8369..048cb0c 100755 --- a/kms/scripts/db/postgres/kms_core_db_postgres.sql +++ b/kms/scripts/db/postgres/kms_core_db_postgres.sql @@ -1,3 +1,18 @@ +-- 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. + DROP TABLE IF EXISTS ranger_masterkey CASCADE; DROP SEQUENCE IF EXISTS RANGER_MASTERKEY_SEQ; CREATE SEQUENCE RANGER_MASTERKEY_SEQ; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/cdcb1c04/kms/scripts/db/sqlserver/kms_core_db_sqlserver.sql ---------------------------------------------------------------------- diff --git a/kms/scripts/db/sqlserver/kms_core_db_sqlserver.sql b/kms/scripts/db/sqlserver/kms_core_db_sqlserver.sql index 234939b..32cc38c 100644 --- a/kms/scripts/db/sqlserver/kms_core_db_sqlserver.sql +++ b/kms/scripts/db/sqlserver/kms_core_db_sqlserver.sql @@ -1,3 +1,17 @@ +-- 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. SET ANSI_NULLS ON GO SET QUOTED_IDENTIFIER ON @@ -43,4 +57,4 @@ PRIMARY KEY CLUSTERED [id] ASC )WITH (PAD_INDEX = OFF,STATISTICS_NORECOMPUTE = OFF,IGNORE_DUP_KEY = OFF,ALLOW_ROW_LOCKS = ON,ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] ) ON [PRIMARY] -GO \ No newline at end of file +GO http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/cdcb1c04/kms/scripts/update_property.py ---------------------------------------------------------------------- diff --git a/kms/scripts/update_property.py b/kms/scripts/update_property.py index e27277f..e461ef2 100644 --- a/kms/scripts/update_property.py +++ b/kms/scripts/update_property.py @@ -1,3 +1,19 @@ +#!/usr/bin/python +# 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. + import sys import os from xml.etree import ElementTree as ET http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/cdcb1c04/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index ff6c055..27dda4d 100644 --- a/pom.xml +++ b/pom.xml @@ -437,7 +437,7 @@ </pluginManagement> <plugins> - <!--<plugin> + <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> <version>0.11</version> @@ -485,7 +485,7 @@ </excludes> </configuration> - </plugin>--> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/cdcb1c04/security-admin/scripts/upgrade_admin.py ---------------------------------------------------------------------- diff --git a/security-admin/scripts/upgrade_admin.py b/security-admin/scripts/upgrade_admin.py index c12552c..823edc1 100755 --- a/security-admin/scripts/upgrade_admin.py +++ b/security-admin/scripts/upgrade_admin.py @@ -1,4 +1,18 @@ #!/usr/bin/python +# 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. import re import StringIO import xml.etree.ElementTree as ET http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/cdcb1c04/security-admin/src/main/java/org/apache/ranger/biz/KmsKeyMgr.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/biz/KmsKeyMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/KmsKeyMgr.java index fd2dd3b..ebc05b8 100755 --- a/security-admin/src/main/java/org/apache/ranger/biz/KmsKeyMgr.java +++ b/security-admin/src/main/java/org/apache/ranger/biz/KmsKeyMgr.java @@ -1,3 +1,22 @@ +/* + * 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. + */ + package org.apache.ranger.biz; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/cdcb1c04/security-admin/src/main/java/org/apache/ranger/rest/XKeyREST.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/rest/XKeyREST.java b/security-admin/src/main/java/org/apache/ranger/rest/XKeyREST.java index 47ec0c1..379ea3c 100755 --- a/security-admin/src/main/java/org/apache/ranger/rest/XKeyREST.java +++ b/security-admin/src/main/java/org/apache/ranger/rest/XKeyREST.java @@ -1,3 +1,21 @@ +/* + * 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. + */ package org.apache.ranger.rest; import javax.servlet.http.HttpServletRequest; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/cdcb1c04/security-admin/src/main/java/org/apache/ranger/security/handler/RangerAuthenticationProvider.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/security/handler/RangerAuthenticationProvider.java b/security-admin/src/main/java/org/apache/ranger/security/handler/RangerAuthenticationProvider.java index 8dae0c7..f74e5d9 100644 --- a/security-admin/src/main/java/org/apache/ranger/security/handler/RangerAuthenticationProvider.java +++ b/security-admin/src/main/java/org/apache/ranger/security/handler/RangerAuthenticationProvider.java @@ -1,3 +1,22 @@ +/* + * 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. + */ + package org.apache.ranger.security.handler; import java.security.Principal; @@ -391,4 +410,4 @@ public class RangerAuthenticationProvider implements AuthenticationProvider { } return authentication; } -} \ No newline at end of file +}
