这是indexloc提供的服务，不要输入任何密码
Skip to content

Issue 9539 #4068

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

Closed
wants to merge 2 commits into from
Closed

Issue 9539 #4068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd29418
Fix #9539
jwsi May 21, 2019
89250f0
Convert spaces to tabs.
jwsi May 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions src/etc/inc/auth.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,9 @@ function local_sync_accounts($u2add, $u2del, $g2add, $g2del) {
}

foreach($u2del as $user) {
if ($user['uid'] < 2000 || $user['uid'] > 65000) {
if ($user['uid'] > 65000) {
continue;
} else if ($user['uid'] < 2000 && !in_array($user, $u2add)) {
continue;
}

Expand Down Expand Up @@ -774,9 +776,14 @@ function local_user_del($user) {
}

function local_user_set_password(&$user, $password) {
global $config;

unset($user['password']);
unset($user['md5-hash']);
$user['bcrypt-hash'] = password_hash($password, PASSWORD_BCRYPT);
if ($user['name'] == $config['hasync']['username']) {
$config['hasync']['new_password'] = $password;
}
}

function local_user_get_groups($user, $all = false) {
Expand Down Expand Up @@ -1641,7 +1648,7 @@ function radius_backed($username, $password, $authcfg, &$attributes = array()) {
}
if (!is_ipaddr($nasip)) {
$nasip = get_interface_ip($nasip);

if (!is_ipaddr($nasip)) {
$nasip = get_interface_ip();//We use wan interface IP as fallback for NAS-IP-Address
}
Expand All @@ -1650,7 +1657,7 @@ function radius_backed($username, $password, $authcfg, &$attributes = array()) {

$rauth->putAttribute(RADIUS_NAS_IP_ADDRESS, $nasip, "addr");
$rauth->putAttribute(RADIUS_NAS_IDENTIFIER, $nasid);

if(!empty($attributes['calling_station_id'])) {
$rauth->putAttribute(RADIUS_CALLING_STATION_ID, $attributes['calling_station_id']);
}
Expand All @@ -1661,7 +1668,7 @@ function radius_backed($username, $password, $authcfg, &$attributes = array()) {
}
if(!empty($attributes['nas_port_type'])) {
$rauth->putAttribute(RADIUS_NAS_PORT_TYPE, $attributes['nas_port_type']);
}
}
if(!empty($attributes['nas_port'])) {
$rauth->putAttribute(RADIUS_NAS_PORT, intval($attributes['nas_port']), 'integer');
}
Expand All @@ -1684,7 +1691,7 @@ function radius_backed($username, $password, $authcfg, &$attributes = array()) {
$ret = false;
}


// Get attributes, even if auth failed.
if ($rauth->getAttributes()) {
$attributes = array_merge($attributes,$rauth->listAttributes());
Expand All @@ -1695,7 +1702,7 @@ function radius_backed($username, $password, $authcfg, &$attributes = array()) {
$stt = strtotime(preg_replace("/\+(\d+):(\d+)$/", " +\${1}\${2}", preg_replace("/(\d+)T(\d+)/", "\${1} \${2}",$stt)));
}
}

// close OO RADIUS_AUTHENTICATION
$rauth->close();

Expand Down Expand Up @@ -1888,7 +1895,7 @@ function getUserGroups($username, $authcfg, &$attributes = array()) {
}

/*
Possible return values :
Possible return values :
true : authentication worked
false : authentication failed (invalid login/password, not enought permission, etc...)
null : error during authentication process (unable to reach remote server, etc...)
Expand Down
6 changes: 6 additions & 0 deletions src/etc/rc.filter_synchronize
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,12 @@ function carp_sync_xml($sections) {
if ($resp != null) {
$url = $rpc_client->getUrl();
update_filter_reload_status("XMLRPC sync successfully completed with {$url}.");
if (isset($config['hasync']['new_password'])) {
update_filter_reload_status("Updating XMLRPC sync password.");
$config['hasync']['password'] = $config['hasync']['new_password'];
unset($config['hasync']['new_password']);
write_config("Update XMLRPC sync password.");
}
return true;
}
return false;
Expand Down
6 changes: 1 addition & 5 deletions src/usr/local/www/xmlrpc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,8 +299,6 @@ public function restore_config_section($sections) {

if ($idx === false) {
$u2add[] = $user;
} else if ($user['uid'] < 2000) {
$u2keep[] = $idx;
} else if ($user != $local_users[$idx]) {
$u2add[] = $user;
$u2del[] = $user;
Expand Down Expand Up @@ -661,9 +659,7 @@ public function merge_config_section($section) {
*
* @return bool
*/
public function filter_configure($reset_accounts = true) {
$this->auth();

private function filter_configure($reset_accounts = true) {
global $g, $config;

filter_configure();
Expand Down