Skip to content

Reads '%p' password from current user session instead of db #55

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

Open
SurajDadral wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Reads '%p' password from current user session instead of db #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions drivers/caldav/caldav_client.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ public function __construct($uri, $user = null, $pass = null)
$this->rc = rcmail::get_instance();

if ($user) $settings['userName'] = $user;
if ($pass == '%p') {
$password = $this->rc->get_user_password();
$pass = str_replace('%p', $password, $pass);
}
if ($pass) $settings['password'] = $pass;

parent::__construct($settings);
Expand Down
7 changes: 4 additions & 3 deletions drivers/caldav/caldav_driver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,12 @@ protected function _setup_preinstalled_sources()
foreach ($preinstalled_sources as $cal){
$url = $cal['caldav_url'];
$user = $cal['caldav_user'];
$pass = $cal['caldav_pass'];

$url = str_replace('%u', $username, $url);
$user = str_replace('%u', $username, $user);
$pass = str_replace('%p', $password, $pass);

$cal['caldav_url'] = $url;
$cal['caldav_user'] = $user;
$cal['caldav_pass'] = $pass;

if (!$this->create_source($cal)) {
$error_msg = 'Unable to add default calendars' . ($this->last_error ? ': ' . $this->last_error :'');
Expand Down Expand Up @@ -2339,12 +2336,16 @@ private function _unix_timestamp($field)
}

private function _decrypt_pass($pass) {
if ($pass == '%p') return $pass;

$p = base64_decode($pass);
$e = new Encryption();
return $e->decrypt($p);
}

private function _encrypt_pass($pass) {
if ($pass == '%p') return $pass;

$e = new Encryption();
$p = $e->encrypt($pass);
return base64_encode($p);
Expand Down