Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Support admin API authentication with SSL certificates #1747

Merged
merged 38 commits into from
Jul 21, 2020

Conversation

nic-chen
Copy link
Member

Summary

Support client-to-server authentication with SSL certificates for admin api.

conf/config.yaml Outdated Show resolved Hide resolved
doc/two-side-auth-with-ssl.md Outdated Show resolved Hide resolved
.travis.yml Outdated Show resolved Hide resolved
conf/cert/two_side_server.key Outdated Show resolved Hide resolved
conf/config-for-two-side-ssl-auth.yaml Outdated Show resolved Hide resolved
conf/config.yaml Outdated Show resolved Hide resolved
Copy link
Member

@membphis membphis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor style point, we can merge it first

doc/mtls.md Show resolved Hide resolved
@membphis
Copy link
Member

@nic-chen the Travis-CI seems been blocked. you can rebase your branch.

conf/config.yaml Outdated Show resolved Hide resolved
conf/config.yaml Outdated Show resolved Hide resolved
conf/config.yaml Outdated Show resolved Hide resolved
bin/apisix Outdated Show resolved Hide resolved
@moonming moonming changed the title feat: Support client-to-server authentication with SSL certificates feat: Support admin API authentication with SSL certificates Jun 24, 2020
conf/config.yaml Outdated Show resolved Hide resolved
conf/config.yaml Outdated Show resolved Hide resolved
bin/apisix Show resolved Hide resolved
doc/mtls.md Show resolved Hide resolved
.travis.yml Outdated
@@ -9,6 +9,8 @@ matrix:
services:
- docker
env: OSNAME=linux_openresty
- os: linux
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

run this test case in Github Action, the Travis-CI is slow.

what do you think? @nic-chen

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's good. I will try to move to github actions.

@membphis
Copy link
Member

@nic-chen please rebase your branch with master

# Conflicts:
#	.travis.yml
@membphis
Copy link
Member

I think we can merge this PR first, and then submit the PR separately to fix it: #1747 (comment)
What do you think?

@moonming moonming merged commit a5fc25c into apache:master Jul 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants