proxmox-mirrors/pve-access-control
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-access-control synced 2025-08-14 18:05:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Auth::LDAP, Auth::AD: ipv6 support

Browse Source 
Also had to change server1/server2 schema from a pattern to
the 'address' format.
This commit is contained in:
Wolfgang Bumiller 2015-12-02 16:06:46 +01:00 committed by Dietmar Maurer
parent 085f3e07e1
commit 8b600c4d27
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PVE/Auth/AD.pm
View File

@ -4,6 +4,7 @@ use strict;
use warnings;
use PVE::Auth::Plugin;
use Net::LDAP;
use Net::IP;
use base qw(PVE::Auth::Plugin);
@ -16,14 +17,14 @@ sub properties {
server1 => {
description => "Server IP address (or DNS name)",
type => 'string',
pattern => '[\w\d]+(.[\w\d]+)*',
format => 'address',
maxLength => 256,
},
server2 => {
description => "Fallback Server IP address (or DNS name)",
type => 'string',
optional => 1,
pattern => '[\w\d]+(.[\w\d]+)*',
format => 'address',
maxLength => 256,
},
secure => {
@ -80,6 +81,7 @@ my $authenticate_user_ad = sub {
my $default_port = $config->{secure} ? 636: 389;
my $port = $config->{port} ? $config->{port} : $default_port;
my $scheme = $config->{secure} ? 'ldaps' : 'ldap';
$server = "[$server]" if Net::IP::ip_is_ipv6($server);
my $conn_string = "$scheme://${server}:$port";
my $ldap = Net::LDAP->new($conn_string) || die "$@\n";

2
PVE/Auth/LDAP.pm
View File

@ -5,6 +5,7 @@ use warnings;
use PVE::Auth::Plugin;
use Net::LDAP;
use Net::IP;
use base qw(PVE::Auth::Plugin);
sub type {
@ -50,6 +51,7 @@ my $authenticate_user_ldap = sub {
my $default_port = $config->{secure} ? 636: 389;
my $port = $config->{port} ? $config->{port} : $default_port;
my $scheme = $config->{secure} ? 'ldaps' : 'ldap';
$server = "[$server]" if Net::IP::ip_is_ipv6($server);
my $conn_string = "$scheme://${server}:$port";
my $ldap = Net::LDAP->new($conn_string, verify => 'none') || die "$@\n";