You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pl...@apache.org on 2017/11/27 01:37:24 UTC
[3/3] directory-kerby git commit: Change some links of docs.
Change some links of docs.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/438904f7
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/438904f7
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/438904f7
Branch: refs/heads/has-project
Commit: 438904f7e557a085c8c336efd2d2be304291d246
Parents: 90506c4
Author: plusplusjiajia <ji...@intel.com>
Authored: Mon Nov 27 09:33:13 2017 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Mon Nov 27 09:33:13 2017 +0800
----------------------------------------------------------------------
has/README.md | 32 +++++++-------
has/doc/has-ha.md | 2 +-
has/doc/has-start.md | 10 ++---
has/doc/performance-report.md | 2 +-
has/has-dist/bin/quick-start.sh | 2 +-
has/has-plugins/pom.xml | 10 -----
...org.apache.hadoop.has.client.HasClientPlugin | 1 -
...org.apache.hadoop.has.server.HasServerPlugin | 1 -
.../plugins/TestHasClientPluginRegistry.java | 44 --------------------
.../plugins/TestHasServerPluginRegistry.java | 43 -------------------
.../hadoop/has/server/admin/LocalHasAdmin.java | 2 +-
.../has/server/kdc/MySQLIdentityBackend.java | 2 +-
.../hadmin/local/cmd/GetPrincipalCmd.java | 2 +-
has/supports/hadoop/README.md | 6 +--
14 files changed, 30 insertions(+), 129 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/438904f7/has/README.md
----------------------------------------------------------------------
diff --git a/has/README.md b/has/README.md
index f06b393..c1362af 100644
--- a/has/README.md
+++ b/has/README.md
@@ -8,11 +8,11 @@ A dedicated Hadoop Authentication Server to support various authentication mecha
* New authentication mechanism can be customized and plugined.
# Architecture
-
+
# Design
Assuming existing users are stored in a SQL database (like MySQL), the detailed design and workflow may go like the following:
-
+
# New mechanism plugin API
@@ -42,36 +42,36 @@ AuthToken authenticate(AuthToken userToken) throws HasAuthenException
```
## REST API
-Please look at [REST API](https://github.com/intel-bigdata/has/blob/release-1.0.0/doc/rest-api.md) for details.
+Please look at [REST API](https://github.com/apache/directory-kerby/blob/has-project/has/doc/rest-api.md) for details.
## How to start
-Please look at [How to start](https://github.com/intel-bigdata/has/blob/release-1.0.0/doc/has-start.md) for details.
+Please look at [How to start](https://github.com/apache/directory-kerby/blob/has-project/has/doc/has-start.md) for details.
## High Availability
-Please look at [High Availability](https://github.com/intel-bigdata/has/blob/release-1.0.0/doc/has-ha.md) for details.
+Please look at [High Availability](https://github.com/apache/directory-kerby/blob/has-project/has/doc/has-ha.md) for details.
## Cross Realm
-Please look at [How to setup cross-realm](https://github.com/intel-bigdata/has/blob/cross-realm/doc/cross-realm.md) for details.
+Please look at [How to setup cross-realm](https://github.com/apache/directory-kerby/blob/has-project/has/doc/cross-realm.md) for details.
## Enable Hadoop ecosystem components
-* [Enable Hadoop](https://github.com/Intel-bigdata/HAS/blob/release-1.0.0/supports/hadoop/README.md)
+* [Enable Hadoop](https://github.com/apache/directory-kerby/blob/has-project/has/supports/hadoop/README.md)
-* [Enable Zookeeper](https://github.com/Intel-bigdata/HAS/blob/release-1.0.0/supports/zookeeper/README.md)
+* [Enable Zookeeper](https://github.com/apache/directory-kerby/blob/has-project/has/supports/zookeeper/README.md)
-* [Enable HBase](https://github.com/Intel-bigdata/HAS/blob/release-1.0.0/supports/hbase/README.md)
+* [Enable HBase](https://github.com/apache/directory-kerby/blob/has-project/has/supports/hbase/README.md)
-* [Enable Hive](https://github.com/Intel-bigdata/HAS/blob/release-1.0.0/supports/hive/README.md)
+* [Enable Hive](https://github.com/apache/directory-kerby/blob/has-project/has/supports/hive/README.md)
-* [Enable Phoenix](https://github.com/Intel-bigdata/HAS/blob/release-1.0.0/supports/phoenix/README.md)
+* [Enable Phoenix](https://github.com/apache/directory-kerby/blob/has-project/has/supports/phoenix/README.md)
-* [Enable Thrift](https://github.com/Intel-bigdata/HAS/blob/release-1.0.0/supports/thrift/README.md)
+* [Enable Thrift](https://github.com/apache/directory-kerby/blob/has-project/has/supports/thrift/README.md)
-* [Enable Spark](https://github.com/Intel-bigdata/HAS/blob/release-1.0.0/supports/spark/README.md)
+* [Enable Spark](https://github.com/apache/directory-kerby/blob/has-project/has/supports/spark/README.md)
-* [Enable Oozie](https://github.com/Intel-bigdata/HAS/blob/release-1.0.0/supports/oozie/README.md)
+* [Enable Oozie](https://github.com/apache/directory-kerby/blob/has-project/has/supports/oozie/README.md)
-* [Enable Presto](https://github.com/Intel-bigdata/HAS/blob/release-1.0.0/supports/presto/README.md)
+* [Enable Presto](https://github.com/apache/directory-kerby/blob/has-project/has/supports/presto/README.md)
## List of supported Hadoop ecosystem components
@@ -90,4 +90,4 @@ Please look at [How to setup cross-realm](https://github.com/intel-bigdata/has/b
| Sqoop | Yes | No | No |
## Performance test report
-Please look at [Performance test report](https://github.com/intel-bigdata/has/blob/release-1.0.0/doc/performance-report.md) for details.
+Please look at [Performance test report](https://github.com/apache/directory-kerby/blob/has-project/has/doc/performance-report.md) for details.
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/438904f7/has/doc/has-ha.md
----------------------------------------------------------------------
diff --git a/has/doc/has-ha.md b/has/doc/has-ha.md
index b683878..34fa031 100644
--- a/has/doc/has-ha.md
+++ b/has/doc/has-ha.md
@@ -39,7 +39,7 @@ The two redundant HAS servers must have same https ports. Below are examples:
The two redundant HAS servers must use **mysql** backend, and have same *mysql_url*, *mysql_user* and *mysql_password*.
-Please look at [How to use mysql backend](https://github.com/intel-bigdata/has/blob/release-1.0.0/doc/mysql-backend.md) for mysql backend configuration.
+Please look at [How to use mysql backend](https://github.com/apache/directory-kerby/blob/has-project/has/doc/mysql-backend.md) for mysql backend configuration.
### 4. Configure HAS KDC
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/438904f7/has/doc/has-start.md
----------------------------------------------------------------------
diff --git a/has/doc/has-start.md b/has/doc/has-start.md
index 43bc2eb..30f6567 100644
--- a/has/doc/has-start.md
+++ b/has/doc/has-start.md
@@ -5,19 +5,19 @@ How to start
### Download HAS source code:
```
-git clone https://github.com/Intel-bigdata/HAS.git
+git clone https://github.com/apache/directory-kerby.git -b has-project
```
### Install HAS:
```
-cd HAS
+cd directory-kerby/has
mvn clean install
```
## 2. Start and configure HAS server
### Deploy https
-Please look at [How to deploy https](https://github.com/intel-bigdata/has/blob/release-1.0.0/doc/deploy-https.md) for details.
+Please look at [How to deploy https](https://github.com/apache/directory-kerby/blob/has-project/has/doc/deploy-https.md) for details.
### Configure has-server.conf in <conf_dir>:
An example of has-server.conf:
@@ -71,7 +71,7 @@ KdcInitTool: config_kdcBackend json /tmp/has/jsonbackend
KdcInitTool: config_kdcBackend mysql jdbc:mysql://127.0.0.1:3306/mysqlbackend root passwd
KdcInitTool: exit
```
-For mysql backend, please refer to [How to use mysql backend](https://github.com/intel-bigdata/has/blob/release-1.0.0/doc/mysql-backend.md) for details.
+For mysql backend, please refer to [How to use mysql backend](https://github.com/apache/directory-kerby/blob/has-project/has/doc/mysql-backend.md) for details.
### Configure HAS KDC:
```
@@ -104,7 +104,7 @@ KdcInitTool: exit
```
### Deploy http spnego
-Please look at [How to deploy http spnego](https://github.com/intel-bigdata/has/blob/release-1.0.0/doc/deploy-spnego.md) for details.
+Please look at [How to deploy http spnego](https://github.com/apache/directory-kerby/blob/has-project/has/doc/deploy-spnego.md) for details.
Please restart the HAS server
```
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/438904f7/has/doc/performance-report.md
----------------------------------------------------------------------
diff --git a/has/doc/performance-report.md b/has/doc/performance-report.md
index e542782..20d196b 100644
--- a/has/doc/performance-report.md
+++ b/has/doc/performance-report.md
@@ -33,7 +33,7 @@ The test use Alibaba Cloud Elastic Compute Service, detailed test environment li
## 3. Test Method
-By using [login-test](https://github.com/Intel-bigdata/HAS/blob/master/has-dist/bin/login-test.sh) scripting tool, the test can be broadly divided into four steps:
+By using [login-test](https://github.com/apache/directory-kerby/blob/has-project/has/has-dist/bin/login-test.sh) scripting tool, the test can be broadly divided into four steps:
1. Add principals to HAS server
2. Export keytab files to HAS Client
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/438904f7/has/has-dist/bin/quick-start.sh
----------------------------------------------------------------------
diff --git a/has/has-dist/bin/quick-start.sh b/has/has-dist/bin/quick-start.sh
index fbe6812..73e0ea0 100644
--- a/has/has-dist/bin/quick-start.sh
+++ b/has/has-dist/bin/quick-start.sh
@@ -31,7 +31,7 @@ sleep 2s
# 3. Set Realm
echo "Set Realm..."
-curl -X PUT "http://localhost:8091/has/v1/conf/setKdcRealm?realm=ALIYUN.COM"
+curl -X PUT "http://localhost:8091/has/v1/conf/setKdcRealm?realm=EXAMPLE.COM"
sleep 2s
# 4. Start HAS
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/438904f7/has/has-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/has/has-plugins/pom.xml b/has/has-plugins/pom.xml
index 3cdc12a..d5b2195 100644
--- a/has/has-plugins/pom.xml
+++ b/has/has-plugins/pom.xml
@@ -18,16 +18,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>com.aliyun</groupId>
- <artifactId>aliyun-java-sdk-ram</artifactId>
- <version>2.0.7</version>
- </dependency>
- <dependency>
- <groupId>com.aliyun</groupId>
- <artifactId>aliyun-java-sdk-core</artifactId>
- <version>2.2.3</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/438904f7/has/has-plugins/src/main/resources/META-INF/services/org.apache.hadoop.has.client.HasClientPlugin
----------------------------------------------------------------------
diff --git a/has/has-plugins/src/main/resources/META-INF/services/org.apache.hadoop.has.client.HasClientPlugin b/has/has-plugins/src/main/resources/META-INF/services/org.apache.hadoop.has.client.HasClientPlugin
index 9f6edbc..09697dc 100644
--- a/has/has-plugins/src/main/resources/META-INF/services/org.apache.hadoop.has.client.HasClientPlugin
+++ b/has/has-plugins/src/main/resources/META-INF/services/org.apache.hadoop.has.client.HasClientPlugin
@@ -13,4 +13,3 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.hadoop.has.plugins.client.aliyun.AliyunHasClientPlugin
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/438904f7/has/has-plugins/src/main/resources/META-INF/services/org.apache.hadoop.has.server.HasServerPlugin
----------------------------------------------------------------------
diff --git a/has/has-plugins/src/main/resources/META-INF/services/org.apache.hadoop.has.server.HasServerPlugin b/has/has-plugins/src/main/resources/META-INF/services/org.apache.hadoop.has.server.HasServerPlugin
index fa342e5..09697dc 100644
--- a/has/has-plugins/src/main/resources/META-INF/services/org.apache.hadoop.has.server.HasServerPlugin
+++ b/has/has-plugins/src/main/resources/META-INF/services/org.apache.hadoop.has.server.HasServerPlugin
@@ -13,4 +13,3 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.hadoop.has.plugins.server.aliyun.AliyunHasServerPlugin
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/438904f7/has/has-plugins/src/test/java/org/apache/hadoop/has/plugins/TestHasClientPluginRegistry.java
----------------------------------------------------------------------
diff --git a/has/has-plugins/src/test/java/org/apache/hadoop/has/plugins/TestHasClientPluginRegistry.java b/has/has-plugins/src/test/java/org/apache/hadoop/has/plugins/TestHasClientPluginRegistry.java
deleted file mode 100644
index 4c60250..0000000
--- a/has/has-plugins/src/test/java/org/apache/hadoop/has/plugins/TestHasClientPluginRegistry.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * 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.hadoop.has.plugins;
-
-import org.apache.hadoop.has.client.HasClientPluginRegistry;
-import org.apache.hadoop.has.common.HasException;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.util.Set;
-
-public class TestHasClientPluginRegistry {
-
- @Test
- public void testInit() {
- Set<String> pluginsNames = HasClientPluginRegistry.registeredPlugins();
- Assert.assertTrue(pluginsNames.size() > 0);
- }
-
- @Test
- public void testCreatePlugin() throws HasException {
- Assert.assertTrue(HasClientPluginRegistry.createPlugin("RAM") != null);
- Set<String> pluginNames = HasClientPluginRegistry.registeredPlugins();
- for (String name : pluginNames) {
- HasClientPluginRegistry.createPlugin(name);
- }
- }
-}
-
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/438904f7/has/has-plugins/src/test/java/org/apache/hadoop/has/plugins/TestHasServerPluginRegistry.java
----------------------------------------------------------------------
diff --git a/has/has-plugins/src/test/java/org/apache/hadoop/has/plugins/TestHasServerPluginRegistry.java b/has/has-plugins/src/test/java/org/apache/hadoop/has/plugins/TestHasServerPluginRegistry.java
deleted file mode 100644
index 78f307f..0000000
--- a/has/has-plugins/src/test/java/org/apache/hadoop/has/plugins/TestHasServerPluginRegistry.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * 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.hadoop.has.plugins;
-
-import org.apache.hadoop.has.common.HasException;
-import org.apache.hadoop.has.server.HasServerPluginRegistry;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.util.Set;
-
-public class TestHasServerPluginRegistry {
-
- @Test
- public void testInit() {
- Set<String> pluginsNames = HasServerPluginRegistry.registeredPlugins();
- Assert.assertTrue(pluginsNames.size() > 0);
- }
-
- @Test
- public void testCreatePlugin() throws HasException {
- Assert.assertTrue(HasServerPluginRegistry.createPlugin("RAM") != null);
- Set<String> pluginNames = HasServerPluginRegistry.registeredPlugins();
- for (String name : pluginNames) {
- HasServerPluginRegistry.createPlugin(name);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/438904f7/has/has-server/src/main/java/org/apache/hadoop/has/server/admin/LocalHasAdmin.java
----------------------------------------------------------------------
diff --git a/has/has-server/src/main/java/org/apache/hadoop/has/server/admin/LocalHasAdmin.java b/has/has-server/src/main/java/org/apache/hadoop/has/server/admin/LocalHasAdmin.java
index 589e092..b49c255 100644
--- a/has/has-server/src/main/java/org/apache/hadoop/has/server/admin/LocalHasAdmin.java
+++ b/has/has-server/src/main/java/org/apache/hadoop/has/server/admin/LocalHasAdmin.java
@@ -28,8 +28,8 @@ import org.apache.kerby.kerberos.kerb.KrbException;
import org.apache.kerby.kerberos.kerb.admin.kadmin.local.LocalKadmin;
import org.apache.kerby.kerberos.kerb.admin.kadmin.local.LocalKadminImpl;
import org.apache.kerby.kerberos.kerb.common.KrbUtil;
-import org.apache.kerby.kerberos.kerb.identity.KrbIdentity;
import org.apache.kerby.kerberos.kerb.identity.backend.BackendConfig;
+import org.apache.kerby.kerberos.kerb.request.KrbIdentity;
import org.apache.kerby.kerberos.kerb.server.KdcConfig;
import org.apache.kerby.kerberos.kerb.server.KdcSetting;
import org.apache.kerby.kerberos.kerb.server.KdcUtil;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/438904f7/has/has-server/src/main/java/org/apache/hadoop/has/server/kdc/MySQLIdentityBackend.java
----------------------------------------------------------------------
diff --git a/has/has-server/src/main/java/org/apache/hadoop/has/server/kdc/MySQLIdentityBackend.java b/has/has-server/src/main/java/org/apache/hadoop/has/server/kdc/MySQLIdentityBackend.java
index 034704a..ec02312 100644
--- a/has/has-server/src/main/java/org/apache/hadoop/has/server/kdc/MySQLIdentityBackend.java
+++ b/has/has-server/src/main/java/org/apache/hadoop/has/server/kdc/MySQLIdentityBackend.java
@@ -23,8 +23,8 @@ import org.apache.commons.dbutils.DbUtils;
import org.apache.directory.api.util.GeneralizedTime;
import org.apache.kerby.config.Config;
import org.apache.kerby.kerberos.kerb.KrbException;
-import org.apache.kerby.kerberos.kerb.identity.KrbIdentity;
import org.apache.kerby.kerberos.kerb.identity.backend.AbstractIdentityBackend;
+import org.apache.kerby.kerberos.kerb.request.KrbIdentity;
import org.apache.kerby.kerberos.kerb.type.KerberosTime;
import org.apache.kerby.kerberos.kerb.type.base.EncryptionKey;
import org.apache.kerby.kerberos.kerb.type.base.EncryptionType;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/438904f7/has/has-tool/has-server-tool/src/main/java/org/apache/hadoop/has/tool/server/hadmin/local/cmd/GetPrincipalCmd.java
----------------------------------------------------------------------
diff --git a/has/has-tool/has-server-tool/src/main/java/org/apache/hadoop/has/tool/server/hadmin/local/cmd/GetPrincipalCmd.java b/has/has-tool/has-server-tool/src/main/java/org/apache/hadoop/has/tool/server/hadmin/local/cmd/GetPrincipalCmd.java
index 88612a8..ed636c8 100644
--- a/has/has-tool/has-server-tool/src/main/java/org/apache/hadoop/has/tool/server/hadmin/local/cmd/GetPrincipalCmd.java
+++ b/has/has-tool/has-server-tool/src/main/java/org/apache/hadoop/has/tool/server/hadmin/local/cmd/GetPrincipalCmd.java
@@ -21,7 +21,7 @@ package org.apache.hadoop.has.tool.server.hadmin.local.cmd;
import org.apache.hadoop.has.common.HasException;
import org.apache.hadoop.has.server.admin.LocalHasAdmin;
-import org.apache.kerby.kerberos.kerb.identity.KrbIdentity;
+import org.apache.kerby.kerberos.kerb.request.KrbIdentity;
import org.apache.kerby.kerberos.kerb.type.base.EncryptionKey;
import org.apache.kerby.kerberos.kerb.type.base.EncryptionType;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/438904f7/has/supports/hadoop/README.md
----------------------------------------------------------------------
diff --git a/has/supports/hadoop/README.md b/has/supports/hadoop/README.md
index 15f177c..1b9f2e1 100644
--- a/has/supports/hadoop/README.md
+++ b/has/supports/hadoop/README.md
@@ -18,7 +18,7 @@ mvn package -Pdist,native -Dtar -DskipTests -Dmaven.javadoc.skip=true -Dcontaine
## 2. Distribute and configure Keytab files
### Create keytab and deploy krb5.conf and has-client.conf
-Please look at [How to start HAS](https://github.com/intel-bigdata/has/blob/release-1.0.0/doc/has-start.md) for details.
+Please look at [How to start HAS](https://github.com/apache/directory-kerby/blob/has-project/has/doc/has-start.md) for details.
### Distribute keytab files to the corresponding nodes.
@@ -240,7 +240,7 @@ cp etc/hadoop/ssl-server.xml.example etc/hadoop/ssl-server.xml
```
Configure ssl-server.xml:
-Please look at [How to deploy https](https://github.com/intel-bigdata/has/blob/release-1.0.0/doc/deploy-https.md).
+Please look at [How to deploy https](https://github.com/apache/directory-kerby/blob/has-project/has/doc/deploy-https.md).
## 4. Configure container-executor
@@ -275,7 +275,7 @@ container-executor --checksetup
## 5. Setting up cross-realm for distcp
### Setup cross realm trust between realms
-Please look at [How to setup cross-realm](https://github.com/intel-bigdata/has/blob/cross-realm/doc/cross-realm.md).
+Please look at [How to setup cross-realm](https://github.com/apache/directory-kerby/blob/has-project/has/doc/cross-realm.md).
### Update core-site.xml