Deleted Added
sdiff udiff text old ( 137019 ) new ( 147005 )
full compact
auth-passwd.c (137019) auth-passwd.c (147005)
1/*
2 * Author: Tatu Ylonen <ylo@cs.hut.fi>
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 * All rights reserved
5 * Password authentication. This file contains the functions to check whether
6 * the password is valid for the user.
7 *
8 * As far as I am concerned, the code I have written for this software

--- 22 unchanged lines hidden (view full) ---

31 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
32 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
33 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
34 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36 */
37
38#include "includes.h"
1/*
2 * Author: Tatu Ylonen <ylo@cs.hut.fi>
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 * All rights reserved
5 * Password authentication. This file contains the functions to check whether
6 * the password is valid for the user.
7 *
8 * As far as I am concerned, the code I have written for this software

--- 22 unchanged lines hidden (view full) ---

31 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
32 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
33 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
34 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36 */
37
38#include "includes.h"
39RCSID("$OpenBSD: auth-passwd.c,v 1.31 2004/01/30 09:48:57 markus Exp $");
40RCSID("$FreeBSD: head/crypto/openssh/auth-passwd.c 137019 2004-10-28 16:11:31Z des $");
39RCSID("$OpenBSD: auth-passwd.c,v 1.33 2005/01/24 11:47:13 dtucker Exp $");
40RCSID("$FreeBSD: head/crypto/openssh/auth-passwd.c 147005 2005-06-05 15:46:09Z des $");
41
42#include "packet.h"
41
42#include "packet.h"
43#include "buffer.h"
43#include "log.h"
44#include "servconf.h"
45#include "auth.h"
46#include "auth-options.h"
47
44#include "log.h"
45#include "servconf.h"
46#include "auth.h"
47#include "auth-options.h"
48
49extern Buffer loginmsg;
48extern ServerOptions options;
50extern ServerOptions options;
49int sys_auth_passwd(Authctxt *, const char *);
50
51
52#ifdef HAVE_LOGIN_CAP
53extern login_cap_t *lc;
54#endif
55
56
57#define DAY (24L * 60 * 60) /* 1 day in seconds */
58#define TWO_WEEKS (2L * 7 * DAY) /* 2 weeks in seconds */
59
51void
52disable_forwarding(void)
53{
54 no_port_forwarding_flag = 1;
55 no_agent_forwarding_flag = 1;
56 no_x11_forwarding_flag = 1;
57}
58
59/*
60 * Tries to authenticate the user using password. Returns true if
61 * authentication succeeds.
62 */
63int
64auth_password(Authctxt *authctxt, const char *password)
65{
66 struct passwd * pw = authctxt->pw;
60void
61disable_forwarding(void)
62{
63 no_port_forwarding_flag = 1;
64 no_agent_forwarding_flag = 1;
65 no_x11_forwarding_flag = 1;
66}
67
68/*
69 * Tries to authenticate the user using password. Returns true if
70 * authentication succeeds.
71 */
72int
73auth_password(Authctxt *authctxt, const char *password)
74{
75 struct passwd * pw = authctxt->pw;
67 int ok = authctxt->valid;
76 int result, ok = authctxt->valid;
68#if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE)
69 static int expire_checked = 0;
70#endif
71
72#ifndef HAVE_CYGWIN
73 if (pw->pw_uid == 0 && options.permit_root_login != PERMIT_YES)
74 ok = 0;
75#endif

--- 20 unchanged lines hidden (view full) ---

96#endif
97#ifdef USE_PAM
98 if (options.use_pam)
99 return (sshpam_auth_passwd(authctxt, password) && ok);
100#endif
101#if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE)
102 if (!expire_checked) {
103 expire_checked = 1;
77#if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE)
78 static int expire_checked = 0;
79#endif
80
81#ifndef HAVE_CYGWIN
82 if (pw->pw_uid == 0 && options.permit_root_login != PERMIT_YES)
83 ok = 0;
84#endif

--- 20 unchanged lines hidden (view full) ---

105#endif
106#ifdef USE_PAM
107 if (options.use_pam)
108 return (sshpam_auth_passwd(authctxt, password) && ok);
109#endif
110#if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE)
111 if (!expire_checked) {
112 expire_checked = 1;
104 if (auth_shadow_pwexpired(authctxt)) {
105 disable_forwarding();
113 if (auth_shadow_pwexpired(authctxt))
106 authctxt->force_pwchange = 1;
114 authctxt->force_pwchange = 1;
107 }
108 }
109#endif
115 }
116#endif
110
111 return (sys_auth_passwd(authctxt, password) && ok);
117 result = sys_auth_passwd(authctxt, password);
118 if (authctxt->force_pwchange)
119 disable_forwarding();
120 return (result && ok);
112}
113
114#ifdef BSD_AUTH
121}
122
123#ifdef BSD_AUTH
124static void
125warn_expiry(Authctxt *authctxt, auth_session_t *as)
126{
127 char buf[256];
128 quad_t pwtimeleft, actimeleft, daysleft, pwwarntime, acwarntime;
129
130 pwwarntime = acwarntime = TWO_WEEKS;
131
132 pwtimeleft = auth_check_change(as);
133 actimeleft = auth_check_expire(as);
134#ifdef HAVE_LOGIN_CAP
135 if (authctxt->valid) {
136 pwwarntime = login_getcaptime(lc, "password-warn", TWO_WEEKS,
137 TWO_WEEKS);
138 acwarntime = login_getcaptime(lc, "expire-warn", TWO_WEEKS,
139 TWO_WEEKS);
140 }
141#endif
142 if (pwtimeleft != 0 && pwtimeleft < pwwarntime) {
143 daysleft = pwtimeleft / DAY + 1;
144 snprintf(buf, sizeof(buf),
145 "Your password will expire in %lld day%s.\n",
146 daysleft, daysleft == 1 ? "" : "s");
147 buffer_append(&loginmsg, buf, strlen(buf));
148 }
149 if (actimeleft != 0 && actimeleft < acwarntime) {
150 daysleft = actimeleft / DAY + 1;
151 snprintf(buf, sizeof(buf),
152 "Your account will expire in %lld day%s.\n",
153 daysleft, daysleft == 1 ? "" : "s");
154 buffer_append(&loginmsg, buf, strlen(buf));
155 }
156}
157
115int
116sys_auth_passwd(Authctxt *authctxt, const char *password)
117{
118 struct passwd *pw = authctxt->pw;
119 auth_session_t *as;
158int
159sys_auth_passwd(Authctxt *authctxt, const char *password)
160{
161 struct passwd *pw = authctxt->pw;
162 auth_session_t *as;
163 static int expire_checked = 0;
120
121 as = auth_usercheck(pw->pw_name, authctxt->style, "auth-ssh",
122 (char *)password);
123 if (auth_getstate(as) & AUTH_PWEXPIRED) {
124 auth_close(as);
125 disable_forwarding();
126 authctxt->force_pwchange = 1;
127 return (1);
128 } else {
164
165 as = auth_usercheck(pw->pw_name, authctxt->style, "auth-ssh",
166 (char *)password);
167 if (auth_getstate(as) & AUTH_PWEXPIRED) {
168 auth_close(as);
169 disable_forwarding();
170 authctxt->force_pwchange = 1;
171 return (1);
172 } else {
173 if (!expire_checked) {
174 expire_checked = 1;
175 warn_expiry(authctxt, as);
176 }
129 return (auth_close(as));
130 }
131}
132#elif !defined(CUSTOM_SYS_AUTH_PASSWD)
133int
134sys_auth_passwd(Authctxt *authctxt, const char *password)
135{
136 struct passwd *pw = authctxt->pw;

--- 20 unchanged lines hidden --- 		177 return (auth_close(as));
178 }
179}
180#elif !defined(CUSTOM_SYS_AUTH_PASSWD)
181int
182sys_auth_passwd(Authctxt *authctxt, const char *password)
183{
184 struct passwd *pw = authctxt->pw;

--- 20 unchanged lines hidden ---