tyler.durden/Win32-OpenSSH
1
0
Fork 0
mirror of https://github.com/PowerShell/Win32-OpenSSH.git synced 2025-07-23 05:55:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes to agent updates

Browse Source
This commit is contained in:
Manoj Ampalam 2016-09-21 13:49:57 -07:00
parent d6d93e6446
commit 6b7d17dd27
4 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
auth-passwd.c
View File

@ -155,23 +155,23 @@ warn_expiry(Authctxt *authctxt, auth_session_t *as)
#ifdef HAVE_LOGIN_CAP #ifdef HAVE_LOGIN_CAP
if (authctxt->valid) { if (authctxt->valid) {
pwwarntime = login_getcaptime(lc, "password-warn", TWO_WEEKS, pwwarntime = login_getcaptime(lc, "password-warn", TWO_WEEKS,
TWO_WEEKS); TWO_WEEKS);
acwarntime = login_getcaptime(lc, "expire-warn", TWO_WEEKS, acwarntime = login_getcaptime(lc, "expire-warn", TWO_WEEKS,
TWO_WEEKS); TWO_WEEKS);
} }
#endif #endif
if (pwtimeleft != 0 && pwtimeleft < pwwarntime) { if (pwtimeleft != 0 && pwtimeleft < pwwarntime) {
daysleft = pwtimeleft / DAY + 1; daysleft = pwtimeleft / DAY + 1;
snprintf(buf, sizeof(buf), snprintf(buf, sizeof(buf),
"Your password will expire in %lld day%s.\n", "Your password will expire in %lld day%s.\n",
daysleft, daysleft == 1 ? "" : "s"); daysleft, daysleft == 1 ? "" : "s");
buffer_append(&loginmsg, buf, strlen(buf)); buffer_append(&loginmsg, buf, strlen(buf));
} }
if (actimeleft != 0 && actimeleft < acwarntime) { if (actimeleft != 0 && actimeleft < acwarntime) {
daysleft = actimeleft / DAY + 1; daysleft = actimeleft / DAY + 1;
snprintf(buf, sizeof(buf), snprintf(buf, sizeof(buf),
"Your account will expire in %lld day%s.\n", "Your account will expire in %lld day%s.\n",
daysleft, daysleft == 1 ? "" : "s"); daysleft, daysleft == 1 ? "" : "s");
buffer_append(&loginmsg, buf, strlen(buf)); buffer_append(&loginmsg, buf, strlen(buf));
} }
} }
@ -184,7 +184,7 @@ sys_auth_passwd(Authctxt *authctxt, const char *password)
static int expire_checked = 0; static int expire_checked = 0;
as = auth_usercheck(pw->pw_name, authctxt->style, "auth-ssh", as = auth_usercheck(pw->pw_name, authctxt->style, "auth-ssh",
(char *)password); (char *)password);
if (as == NULL) if (as == NULL)
return (0); return (0);
if (auth_getstate(as) & AUTH_PWEXPIRED) { if (auth_getstate(as) & AUTH_PWEXPIRED) {
@ -192,8 +192,7 @@ sys_auth_passwd(Authctxt *authctxt, const char *password)
disable_forwarding(); disable_forwarding();
authctxt->force_pwchange = 1; authctxt->force_pwchange = 1;
return (1); return (1);
} } else {
else {
if (!expire_checked) { if (!expire_checked) {
expire_checked = 1; expire_checked = 1;
warn_expiry(authctxt, as); warn_expiry(authctxt, as);
@ -258,13 +257,13 @@ sys_auth_passwd(Authctxt *authctxt, const char *password)
/* Encrypt the candidate password using the proper salt. */ /* Encrypt the candidate password using the proper salt. */
encrypted_password = xcrypt(password, encrypted_password = xcrypt(password,
(pw_password[0] && pw_password[1]) ? pw_password : "xx"); (pw_password[0] && pw_password[1]) ? pw_password : "xx");
/* /*
* Authentication is accepted if the encrypted passwords * Authentication is accepted if the encrypted passwords
* are identical. * are identical.
*/ */
return encrypted_password != NULL && return encrypted_password != NULL &&
strcmp(encrypted_password, pw_password) == 0; strcmp(encrypted_password, pw_password) == 0;
} }
#endif #endif

5
contrib/win32/win32compat/pwd.c
View File

@ -165,7 +165,7 @@ char *GetHomeDirFromToken(char *userName, HANDLE token)
RegCloseKey(reg_key); RegCloseKey(reg_key);
{ /* retrieve and set env variables. */ { /* retrieve and set env variables. */
/* TODO - Get away with fixed limits and dynamically allocated required memory*/ /* TODO - Get away with fixed limits and dynamically allocate required memory, cleanup this logic*/
#define MAX_VALUE_LEN 1000 #define MAX_VALUE_LEN 1000
#define MAX_DATA_LEN 2000 #define MAX_DATA_LEN 2000
#define MAX_EXPANDED_DATA_LEN 5000 #define MAX_EXPANDED_DATA_LEN 5000
@ -176,7 +176,8 @@ char *GetHomeDirFromToken(char *userName, HANDLE token)
int i; int i;
LONG ret; LONG ret;
ImpersonateLoggedOnUser(token); if (ImpersonateLoggedOnUser(token) == FALSE)
debug("Failed to impersonate user token, %d", GetLastError());
SET_USER_ENV(FOLDERID_LocalAppData, L"LOCALAPPDATA"); SET_USER_ENV(FOLDERID_LocalAppData, L"LOCALAPPDATA");
SET_USER_ENV(FOLDERID_Profile, L"USERPROFILE"); SET_USER_ENV(FOLDERID_Profile, L"USERPROFILE");
SET_USER_ENV(FOLDERID_RoamingAppData, L"APPDATA"); SET_USER_ENV(FOLDERID_RoamingAppData, L"APPDATA");

18
contrib/win32/win32compat/ssh-agent/authagent-request.c
View File

@ -201,7 +201,7 @@ generate_user_token(wchar_t* user) {
&token, &token,
&quotas, &quotas,
&subStatus) != STATUS_SUCCESS) { &subStatus) != STATUS_SUCCESS) {
debug("LsaLogonUser failed"); debug("LsaLogonUser failed %d", ret);
goto done; goto done;
} }
@ -256,12 +256,16 @@ int process_passwordauth_request(struct sshbuf* request, struct sshbuf* response
*tmp = L'\0'; *tmp = L'\0';
} }
if (LogonUserW(userW, domW, pwdW, LOGON32_LOGON_NETWORK, LOGON32_PROVIDER_DEFAULT, &token) == FALSE || if (LogonUserW(userW, domW, pwdW, LOGON32_LOGON_NETWORK, LOGON32_PROVIDER_DEFAULT, &token) == FALSE) {
(FALSE == GetNamedPipeClientProcessId(con->connection, &client_pid)) || debug("failed to logon user");
((client_proc = OpenProcess(PROCESS_DUP_HANDLE, FALSE, client_pid)) == NULL) || goto done;
(FALSE == DuplicateHandle(GetCurrentProcess(), token, client_proc, &dup_token, TOKEN_QUERY | TOKEN_IMPERSONATE, FALSE, DUPLICATE_SAME_ACCESS)) || }
(sshbuf_put_u32(response, dup_token) != 0)) {
debug("failed to authenticate user"); if ((FALSE == GetNamedPipeClientProcessId(con->connection, &client_pid)) ||
((client_proc = OpenProcess(PROCESS_DUP_HANDLE, FALSE, client_pid)) == NULL) ||
(FALSE == DuplicateHandle(GetCurrentProcess(), token, client_proc, &dup_token, TOKEN_QUERY | TOKEN_IMPERSONATE, FALSE, DUPLICATE_SAME_ACCESS)) ||
(sshbuf_put_u32(response, dup_token) != 0)) {
debug("failed to duplicate user token");
goto done; goto done;
} }

1
contrib/win32/win32compat/ssh-agent/connection.c
View File

@ -167,6 +167,7 @@ done:
return r; return r;
} }
/* TODO - move this to common header*/
#define SSH_AGENT_AUTHENTICATE 100 #define SSH_AGENT_AUTHENTICATE 100
static int static int