bughz/tinyproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed the check_acl() function to require the peer IP address and string

Browse Source 
address from the calling function.
This commit is contained in:
Robert James Kaes 2002-04-17 20:52:45 +00:00
parent 795f4f2fe7
commit 44bbdb2623
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/acl.c
View File

@ -1,4 +1,4 @@
/* $Id: acl.c,v 1.12 2002-04-09 19:11:09 rjkaes Exp $ /* $Id: acl.c,v 1.13 2002-04-17 20:52:45 rjkaes Exp $
* *
* This system handles Access Control for use of this daemon. A list of * This system handles Access Control for use of this daemon. A list of
* domains, or IP addresses (including IP blocks) are stored in a list * domains, or IP addresses (including IP blocks) are stored in a list
@ -133,7 +133,7 @@ insert_acl(char *location, acl_access_t access_type)
} }
/* /*
* Checks where file descriptor is allowed. * Checks whether file descriptor is allowed.
* *
* Returns: * Returns:
* 1 if allowed * 1 if allowed
@ -141,13 +141,13 @@ insert_acl(char *location, acl_access_t access_type)
* -1 if error * -1 if error
*/ */
int int
check_acl(int fd) check_acl(int fd, const char* ip_address, const char* string_address)
{ {
struct acl_s *aclptr; struct acl_s *aclptr;
char ip_address[PEER_IP_LENGTH];
char string_address[PEER_STRING_LENGTH];
assert(fd >= 0); assert(fd >= 0);
assert(ip_address != NULL);
assert(string_address != NULL);
/* /*
* If there is no access list allow everything. * If there is no access list allow everything.
@ -156,12 +156,6 @@ check_acl(int fd)
if (!aclptr) if (!aclptr)
return 1; return 1;
/*
* Get the IP address and the string domain.
*/
getpeer_ip(fd, ip_address);
getpeer_string(fd, string_address);
while (aclptr) { while (aclptr) {
if (aclptr->type == ACL_STRING) { if (aclptr->type == ACL_STRING) {
size_t test_length = strlen(string_address); size_t test_length = strlen(string_address);

4
src/acl.h
View File

@ -1,4 +1,4 @@
/* $Id: acl.h,v 1.2 2001-06-02 02:07:34 rjkaes Exp $ /* $Id: acl.h,v 1.3 2002-04-17 20:52:45 rjkaes Exp $
* *
* See 'acl.c' for detailed information. * See 'acl.c' for detailed information.
* *
@ -21,6 +21,6 @@
typedef enum { ACL_ALLOW, ACL_DENY } acl_access_t; typedef enum { ACL_ALLOW, ACL_DENY } acl_access_t;
extern int insert_acl(char *location, acl_access_t access_type); extern int insert_acl(char *location, acl_access_t access_type);
extern int check_acl(int fd); extern int check_acl(int fd, const char* ip_address, const char* string_address);
#endif #endif