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.

Sign up for GitHub

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

Jump to bottom

Add NTLM support to VirtualServer and VirtualServerRoute upstreams #1908

Merged
merged 6 commits into from
Aug 30, 2021
Merged

Add NTLM support to VirtualServer and VirtualServerRoute upstreams #1908

merged 6 commits into from
Aug 30, 2021

Conversation

ciarams87
Copy link
Contributor

@ciarams87 ciarams87 commented Aug 27, 2021 •
edited
Loading

Proposed changes

Support setting NTLM authentication in an upstream. See http://nginx.org/en/docs/http/ngx_http_upstream_module.html#ntlm

Closes #1896

Checklist

Before creating a PR, run through this checklist and mark each as complete.

  • I have read the CONTRIBUTING doc
  • I have added tests that prove my fix is effective or that my feature works
  • I have checked that all unit tests pass after adding my changes
  • I have updated necessary documentation
  • I have rebased my branch onto master
  • I will ensure my PR is targeting the master branch and pulling from my branch from my own fork

@github-actions github-actions bot added documentation Pull requests/issues for documentation enhancement Pull requests for new features/feature enhancements labels Aug 27, 2021
soneillf5
soneillf5 reviewed Aug 27, 2021
View reviewed changes
internal/configs/version2/nginx-plus.virtualserver.tmpl
@@ -21,6 +21,8 @@ upstream {{ $u.Name }} {
sticky cookie {{ .Name }}{{ if .Expires }} expires={{ .Expires }}{{ end }}{{ if .Domain }} domain={{ .Domain }}{{ end }}{{ if .HTTPOnly }} httponly{{ end }}{{ if .Secure }} secure{{ end }}{{ if .Path }} path={{ .Path }}{{ end }};
{{ end }}
{{ end }}

{{ if $u.NTLM }}ntlm;{{ end }}
Copy link
Contributor

Choose a reason for hiding this comment

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

so easy!

pleshakov
pleshakov reviewed Aug 27, 2021
View reviewed changes
Copy link
Contributor

@pleshakov pleshakov left a comment

Choose a reason for hiding this comment

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

Hi @ciarams87 Looks good, just a few suggestions

docs/content/configuration/virtualserver-and-virtualserverroute-resources.md Outdated Show resolved Hide resolved
internal/configs/virtualserver.go Outdated Show resolved Hide resolved
lucacome
lucacome approved these changes Aug 27, 2021
View reviewed changes
Copy link
Member

@lucacome lucacome left a comment

Choose a reason for hiding this comment

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

🚀 after suggestions

@ciarams87 ciarams87 merged commit e2b05fd into master Aug 30, 2021
@ciarams87 ciarams87 deleted the feat/add-ntlm-vs-support branch August 30, 2021 10:22
@pleshakov pleshakov changed the title Add ntlm support to virtual server resource Add ntlm support to VirtualServer and VirtualServerRoute upstreams Sep 13, 2021
@pleshakov pleshakov changed the title Add ntlm support to VirtualServer and VirtualServerRoute upstreams Add NTLM support to VirtualServer and VirtualServerRoute upstreams Sep 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pleshakov pleshakov pleshakov left review comments

@soneillf5 soneillf5 soneillf5 approved these changes

@lucacome lucacome lucacome approved these changes

Assignees
No one assigned
Labels
documentation Pull requests/issues for documentation enhancement Pull requests for new features/feature enhancements
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

NTLM and VirtualServer resource
5 participants
@ciarams87 @lucacome @pleshakov @soneillf5 @nginx-bot