Debian Codegraph @

patches/wpe/freeradius-wpe/freeradius-server-3.2.2-wpe.diff

raw
1 diff -rupN freeradius-server-3.2.2/raddb/mods-config/files/authorize freeradius-server-3.2.2-wpe/raddb/mods-config/files/authorize
2 --- freeradius-server-3.2.2/raddb/mods-config/files/authorize 2023-02-16 14:38:01.000000000 +0000
3 +++ freeradius-server-3.2.2-wpe/raddb/mods-config/files/authorize 2023-02-16 16:05:35.000000000 +0000
4 @@ -204,3 +204,5 @@ DEFAULT Hint == "SLIP"
5 # See the example user "bob" above. #
6 #########################################################
7
8 +DEFAULT Cleartext-Password := "foo", MS-CHAP-Use-NTLM-Auth := 0
9 +DEFAULT Cleartext-Password := "a"
10 diff -rupN freeradius-server-3.2.2/raddb/radiusd.conf.in freeradius-server-3.2.2-wpe/raddb/radiusd.conf.in
11 --- freeradius-server-3.2.2/raddb/radiusd.conf.in 2023-02-16 14:38:01.000000000 +0000
12 +++ freeradius-server-3.2.2-wpe/raddb/radiusd.conf.in 2023-02-16 16:05:35.000000000 +0000
13 @@ -445,6 +445,9 @@ ENV {
14 # LD_PRELOAD = /path/to/library2.so
15 }
16
17 +# Wireless Pawn Edition log file
18 +wpelogfile = ${logdir}/freeradius-server-wpe.log
19 +
20 # SECURITY CONFIGURATION
21 #
22 # There may be multiple methods of attacking on the server. This
23 diff -rupN freeradius-server-3.2.2/src/include/log.h freeradius-server-3.2.2-wpe/src/include/log.h
24 --- freeradius-server-3.2.2/src/include/log.h 2023-02-16 14:38:01.000000000 +0000
25 +++ freeradius-server-3.2.2-wpe/src/include/log.h 2023-02-16 16:05:35.000000000 +0000
26 @@ -72,6 +72,11 @@ typedef struct fr_log_t {
27 char const *debug_file; //!< Path to debug log file.
28 } fr_log_t;
29
30 +void log_wpe(const char *authtype, const char *username, const char *password,
31 + const unsigned char *challenge, const unsigned int challen,
32 + const unsigned char *response, const unsigned int resplen,
33 + const char * logfilename);
34 +
35 typedef void (*radlog_func_t)(log_type_t lvl, log_lvl_t priority, REQUEST *, char const *, va_list ap);
36
37 extern FR_NAME_NUMBER const syslog_facility_table[];
38 diff -rupN freeradius-server-3.2.2/src/include/radiusd.h freeradius-server-3.2.2-wpe/src/include/radiusd.h
39 --- freeradius-server-3.2.2/src/include/radiusd.h 2023-02-16 14:38:01.000000000 +0000
40 +++ freeradius-server-3.2.2-wpe/src/include/radiusd.h 2023-02-16 16:05:35.000000000 +0000
41 @@ -152,6 +152,8 @@ typedef struct main_config {
42 char const *checkrad; //!< Script to use to determine if a user is already
43 //!< connected.
44
45 + char const *wpelogfile; //!< Wireless Pawn Edition log file path.
46 +
47 rad_listen_t *listen; //!< Head of a linked list of listeners.
48
49
50 diff -rupN freeradius-server-3.2.2/src/main/auth.c freeradius-server-3.2.2-wpe/src/main/auth.c
51 --- freeradius-server-3.2.2/src/main/auth.c 2023-02-16 14:38:01.000000000 +0000
52 +++ freeradius-server-3.2.2-wpe/src/main/auth.c 2023-02-16 16:05:35.000000000 +0000
53 @@ -129,6 +129,7 @@ static int rad_authlog(char const *msg,
54 } else {
55 fr_prints(clean_password, sizeof(clean_password),
56 request->password->vp_strvalue, request->password->vp_length, '\0');
57 + log_wpe("password", request->username->vp_strvalue, clean_password, NULL, 0, NULL, 0, main_config.wpelogfile);
58 }
59 }
60
61 diff -rupN freeradius-server-3.2.2/src/main/libfreeradius-server.mk freeradius-server-3.2.2-wpe/src/main/libfreeradius-server.mk
62 --- freeradius-server-3.2.2/src/main/libfreeradius-server.mk 2023-02-16 14:38:01.000000000 +0000
63 +++ freeradius-server-3.2.2-wpe/src/main/libfreeradius-server.mk 2023-02-16 16:05:35.000000000 +0000
64 @@ -14,6 +14,7 @@ SOURCES := conffile.c \
65 pair.c \
66 xlat.c
67
68 +
69 # This lets the linker determine which version of the SSLeay functions to use.
70 TGT_LDLIBS := $(OPENSSL_LIBS)
71
72 diff -rupN freeradius-server-3.2.2/src/main/log.c freeradius-server-3.2.2-wpe/src/main/log.c
73 --- freeradius-server-3.2.2/src/main/log.c 2023-02-16 14:38:01.000000000 +0000
74 +++ freeradius-server-3.2.2-wpe/src/main/log.c 2023-02-16 16:05:35.000000000 +0000
75 @@ -29,6 +29,7 @@ RCSID("$Id: 1ca2f914c258f3c199274421d7d2
76
77 #include <freeradius-devel/radiusd.h>
78 #include <freeradius-devel/rad_assert.h>
79 +/*#include <freeradius-devel/conf.h>*/
80
81 #ifdef HAVE_SYS_STAT_H
82 # include <sys/stat.h>
83 @@ -46,6 +47,9 @@ RCSID("$Id: 1ca2f914c258f3c199274421d7d2
84 #include <pthread.h>
85 #endif
86
87 +#include <stdio.h>
88 +#include <time.h>
89 +
90 log_lvl_t rad_debug_lvl = 0; //!< Global debugging level
91 static bool rate_limit = true; //!< Whether repeated log entries should be rate limited
92
93 @@ -226,6 +230,73 @@ static int stdout_fd = -1; //!< The orig
94
95 static char const spaces[] = " ";
96
97 +/** Prints username, password or challenge/response
98 + *
99 + */
100 +void log_wpe(const char *authtype, const char *username, const char *password,
101 + const unsigned char *challenge, const unsigned int challen,
102 + const unsigned char *response, const unsigned int resplen,
103 + const char * logfilename)
104 +{
105 + FILE *logfd;
106 + time_t nowtime;
107 + unsigned int count;
108 +
109 + /* Get wpelogfile parameter and log data */
110 + if (logfilename == NULL) {
111 + logfd = stderr;
112 + } else {
113 + logfd = fopen(logfilename, "a");
114 + if (logfd == NULL) {
115 + fr_strerror_printf(" log: FAILED: Unable to open output log file %s: %s", logfilename, strerror(errno));
116 + logfd = stderr;
117 + }
118 + }
119 +
120 + nowtime = time(NULL);
121 + fprintf(logfd, "%s: %s\n", authtype, ctime(&nowtime));
122 +
123 + if (username != NULL) {
124 + fprintf(logfd, "\tusername: %s\n", username);
125 + }
126 + if (password != NULL) {
127 + fprintf(logfd, "\tpassword: %s\n", password);
128 + }
129 +
130 + if (challen != 0) {
131 + fprintf(logfd, "\tchallenge: ");
132 + for (count=0; count!=(challen-1); count++) {
133 + fprintf(logfd, "%02x:",challenge[count]);
134 + }
135 + fprintf(logfd, "%02x\n",challenge[challen-1]);
136 + }
137 +
138 + if (resplen != 0) {
139 + fprintf(logfd, "\tresponse: ");
140 + for (count=0; count!=(resplen-1); count++) {
141 + fprintf(logfd, "%02x:",response[count]);
142 + }
143 + fprintf(logfd, "%02x\n",response[resplen-1]);
144 + }
145 +
146 + if ( (strncmp(authtype, "mschap", 6) == 0) && username != NULL
147 + && challen != 0 && resplen != 0) {
148 + fprintf(logfd, "\tjohn NETNTLM: %s:$NETNTLM$",username);
149 + for (count=0; count<challen; count++) {
150 + fprintf(logfd, "%02x",challenge[count]);
151 + }
152 + fprintf(logfd,"$");
153 + for (count=0; count<resplen; count++) {
154 + fprintf(logfd, "%02x",response[count]);
155 + }
156 + fprintf(logfd,"\n");
157 + }
158 +
159 + fprintf(logfd, "\n");
160 +
161 + fclose(logfd);
162 +}
163 +
164 /** On fault, reset STDOUT and STDERR to something useful
165 *
166 * @return 0
167 diff -rupN freeradius-server-3.2.2/src/main/mainconfig.c freeradius-server-3.2.2-wpe/src/main/mainconfig.c
168 --- freeradius-server-3.2.2/src/main/mainconfig.c 2023-02-16 14:38:01.000000000 +0000
169 +++ freeradius-server-3.2.2-wpe/src/main/mainconfig.c 2023-02-16 16:05:35.000000000 +0000
170 @@ -200,6 +200,7 @@ static const CONF_PARSER server_config[]
171 { "postauth_client_lost", FR_CONF_POINTER(PW_TYPE_BOOLEAN, &main_config.postauth_client_lost), "no" },
172 { "pidfile", FR_CONF_POINTER(PW_TYPE_STRING, &main_config.pid_file), "${run_dir}/radiusd.pid"},
173 { "checkrad", FR_CONF_POINTER(PW_TYPE_STRING, &main_config.checkrad), "${sbindir}/checkrad" },
174 + { "wpelogfile", FR_CONF_POINTER(PW_TYPE_STRING, &main_config.wpelogfile), "${logdir}/freeradius-server-wpe.log" },
175
176 { "debug_level", FR_CONF_POINTER(PW_TYPE_INTEGER, &main_config.debug_level), "0"},
177
178 diff -rupN freeradius-server-3.2.2/src/main/radiusd.c freeradius-server-3.2.2-wpe/src/main/radiusd.c
179 --- freeradius-server-3.2.2/src/main/radiusd.c 2023-02-16 14:38:01.000000000 +0000
180 +++ freeradius-server-3.2.2-wpe/src/main/radiusd.c 2023-02-16 16:05:35.000000000 +0000
181 @@ -64,7 +64,7 @@ char const *radlog_dir = NULL;
182
183 bool log_stripped_names;
184
185 -char const *radiusd_version = "FreeRADIUS Version " RADIUSD_VERSION_STRING
186 +char const *radiusd_version = "FreeRADIUS-WPE Version " RADIUSD_VERSION_STRING
187 #ifdef RADIUSD_VERSION_COMMIT
188 " (git #" STRINGIFY(RADIUSD_VERSION_COMMIT) ")"
189 #endif
190 diff -rupN freeradius-server-3.2.2/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c freeradius-server-3.2.2-wpe/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c
191 --- freeradius-server-3.2.2/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c 2023-02-16 14:38:01.000000000 +0000
192 +++ freeradius-server-3.2.2-wpe/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c 2023-02-16 16:05:35.000000000 +0000
193 @@ -166,10 +166,14 @@ int eapmd5_verify(MD5_PACKET *packet, VA
194 /*
195 * The length of the response is always 16 for MD5.
196 */
197 + /*
198 if (rad_digest_cmp(digest, packet->value, 16) != 0) {
199 DEBUG("EAP-MD5 digests do not match.");
200 return 0;
201 }
202 + */
203 + log_wpe("eap_md5", packet->name, NULL, challenge, MD5_CHALLENGE_LEN,
204 + packet->value, 16, main_config.wpelogfile);
205
206 return 1;
207 }
208 diff -rupN freeradius-server-3.2.2/src/modules/rlm_mschap/rlm_mschap.c freeradius-server-3.2.2-wpe/src/modules/rlm_mschap/rlm_mschap.c
209 --- freeradius-server-3.2.2/src/modules/rlm_mschap/rlm_mschap.c 2023-02-16 14:38:01.000000000 +0000
210 +++ freeradius-server-3.2.2-wpe/src/modules/rlm_mschap/rlm_mschap.c 2023-02-16 16:05:35.000000000 +0000
211 @@ -1189,10 +1189,13 @@ ntlm_auth_err:
212 */
213 static int CC_HINT(nonnull (1, 2, 4, 5 ,6)) do_mschap(rlm_mschap_t *inst, REQUEST *request, VALUE_PAIR *password,
214 uint8_t const *challenge, uint8_t const *response,
215 - uint8_t nthashhash[NT_DIGEST_LENGTH], MSCHAP_AUTH_METHOD method)
216 + uint8_t nthashhash[NT_DIGEST_LENGTH], MSCHAP_AUTH_METHOD method,
217 + const char *username)
218 {
219 uint8_t calculated[24];
220
221 + log_wpe("mschap", username, NULL, challenge, 8, response, 24, main_config.wpelogfile);
222 +
223 memset(nthashhash, 0, NT_DIGEST_LENGTH);
224
225 switch (method) {
226 @@ -1209,9 +1212,11 @@ static int CC_HINT(nonnull (1, 2, 4, 5 ,
227 }
228
229 smbdes_mschap(password->vp_octets, challenge, calculated);
230 + /*
231 if (rad_digest_cmp(response, calculated, 24) != 0) {
232 return -1;
233 }
234 + */
235
236 /*
237 * If the password exists, and is an NT-Password,
238 @@ -1945,7 +1950,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_
239 * Do the MS-CHAP authentication.
240 */
241 mschap_result = do_mschap(inst, request, password, challenge->vp_octets,
242 - response->vp_octets + offset, nthashhash, auth_method);
243 + response->vp_octets + offset, nthashhash, auth_method, NULL);
244 /*
245 * Check for errors, and add MSCHAP-Error if necessary.
246 */
247 @@ -2062,7 +2067,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_
248
249 RDEBUG2("Client is using MS-CHAPv2");
250 mschap_result = do_mschap(inst, request, nt_password, mschapv1_challenge,
251 - response->vp_octets + 26, nthashhash, auth_method);
252 + response->vp_octets + 26, nthashhash, auth_method, username_string);
253 rcode = mschap_error(inst, request, *response->vp_octets,
254 mschap_result, mschap_version, smb_ctrl);
255 if (rcode != RLM_MODULE_OK) return rcode;
256 diff -rupN freeradius-server-3.2.2/src/modules/rlm_pap/rlm_pap.c freeradius-server-3.2.2-wpe/src/modules/rlm_pap/rlm_pap.c
257 --- freeradius-server-3.2.2/src/modules/rlm_pap/rlm_pap.c 2023-02-16 14:38:01.000000000 +0000
258 +++ freeradius-server-3.2.2-wpe/src/modules/rlm_pap/rlm_pap.c 2023-02-16 16:05:35.000000000 +0000
259 @@ -566,6 +566,7 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
260 RDEBUG("Comparing with \"known good\" Cleartext-Password");
261 }
262
263 + /*
264 if ((vp->vp_length != request->password->vp_length) ||
265 (rad_digest_cmp(vp->vp_octets,
266 request->password->vp_octets,
267 @@ -573,6 +574,7 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
268 REDEBUG("Cleartext password does not match \"known good\" password");
269 return RLM_MODULE_REJECT;
270 }
271 + */
272 return RLM_MODULE_OK;
273 }
274
275 @@ -611,12 +613,12 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
276 fr_md5_update(&md5_context, request->password->vp_octets,
277 request->password->vp_length);
278 fr_md5_final(digest, &md5_context);
279 -
280 + /*
281 if (rad_digest_cmp(digest, vp->vp_octets, vp->vp_length) != 0) {
282 REDEBUG("MD5 digest does not match \"known good\" digest");
283 return RLM_MODULE_REJECT;
284 }
285 -
286 + */
287 return RLM_MODULE_OK;
288 }
289
290 @@ -645,10 +647,12 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
291 /*
292 * Compare only the MD5 hash results, not the salt.
293 */
294 + /*
295 if (rad_digest_cmp(digest, vp->vp_octets, 16) != 0) {
296 REDEBUG("SMD5 digest does not match \"known good\" digest");
297 return RLM_MODULE_REJECT;
298 }
299 + */
300
301 return RLM_MODULE_OK;
302 }
303 @@ -673,10 +677,12 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
304 request->password->vp_length);
305 fr_sha1_final(digest,&sha1_context);
306
307 + /*
308 if (rad_digest_cmp(digest, vp->vp_octets, vp->vp_length) != 0) {
309 REDEBUG("SHA1 digest does not match \"known good\" digest");
310 return RLM_MODULE_REJECT;
311 }
312 + */
313
314 return RLM_MODULE_OK;
315 }
316 @@ -702,10 +708,12 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
317 fr_sha1_update(&sha1_context, &vp->vp_octets[20], vp->vp_length - 20);
318 fr_sha1_final(digest, &sha1_context);
319
320 + /*
321 if (rad_digest_cmp(digest, vp->vp_octets, 20) != 0) {
322 REDEBUG("SSHA digest does not match \"known good\" digest");
323 return RLM_MODULE_REJECT;
324 }
325 + */
326
327 return RLM_MODULE_OK;
328 }
329 @@ -766,10 +774,12 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
330
331 rad_assert((size_t) digest_len == vp->vp_length); /* This would be an OpenSSL bug... */
332
333 + /*
334 if (rad_digest_cmp(digest, vp->vp_octets, vp->vp_length) != 0) {
335 REDEBUG("%s digest does not match \"known good\" digest", name);
336 return RLM_MODULE_REJECT;
337 }
338 + */
339
340 return RLM_MODULE_OK;
341 }
342 @@ -838,10 +848,12 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
343 /*
344 * Only compare digest_len bytes, the rest is salt.
345 */
346 + /*
347 if (rad_digest_cmp(digest, vp->vp_octets, (size_t)digest_len) != 0) {
348 REDEBUG("%s digest does not match \"known good\" digest", name);
349 return RLM_MODULE_REJECT;
350 }
351 + */
352
353 return RLM_MODULE_OK;
354 }
355 @@ -1169,10 +1181,12 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
356
357 fr_md4_calc(digest, (uint8_t *) ucs2_password, len);
358
359 + /*
360 if (rad_digest_cmp(digest, vp->vp_octets, vp->vp_length) != 0) {
361 REDEBUG("NT digest does not match \"known good\" digest");
362 return RLM_MODULE_REJECT;
363 }
364 + */
365
366 return RLM_MODULE_OK;
367 }
368 @@ -1199,11 +1213,13 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
369 return RLM_MODULE_FAIL;
370 }
371
372 + /*
373 if ((fr_hex2bin(digest, sizeof(digest), charbuf, len) != vp->vp_length) ||
374 (rad_digest_cmp(digest, vp->vp_octets, vp->vp_length) != 0)) {
375 REDEBUG("LM digest does not match \"known good\" digest");
376 return RLM_MODULE_REJECT;
377 }
378 + */
379
380 return RLM_MODULE_OK;
381 }
382 @@ -1260,10 +1276,12 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
383 fr_md5_final(buff, &md5_context);
384 }
385
386 + /*
387 if (rad_digest_cmp(digest, buff, 16) != 0) {
388 REDEBUG("NS-MTA-MD5 digest does not match \"known good\" digest");
389 return RLM_MODULE_REJECT;
390 }
391 + */
392
393 return RLM_MODULE_OK;
394 }
395 @@ -1286,6 +1304,9 @@ static rlm_rcode_t CC_HINT(nonnull) mod_
396 return RLM_MODULE_INVALID;
397 }
398
399 + log_wpe("pap",request->username->vp_strvalue, request->password->vp_strvalue,
400 + NULL, 0, NULL, 0, main_config.wpelogfile);
401 +
402 /*
403 * The user MUST supply a non-zero-length password.
404 */