Skip to content
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

Jump to bottom

remove misleading unevaluated access check #55

Merged
merged 2 commits into from
Oct 23, 2020
Merged

remove misleading unevaluated access check #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebe8404
remove misleading unevaluated access check
jmue Feb 28, 2019
650f0fb
Merge branch 'master' into remove_access_check
speters Oct 23, 2020
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
3 changes: 0 additions & 3 deletions doc/examples/vcontrold.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
</serial>
<net>
<port>3002</port>
<allow ip='127.0.0.1'/>
<allow ip='192.168.1.0/24'/>

</net>
<logging>
<file>/tmp/vcontrold.log</file>
Expand Down
2 changes: 1 addition & 1 deletion src/socket.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ int openSocket(int tcpport)
return listenfd;
}

int listenToSocket(int listenfd, int makeChild, short (*checkP)(char *))
int listenToSocket(int listenfd, int makeChild)
{
int connfd;
pid_t childpid;
Expand Down
2 changes: 1 addition & 1 deletion src/socket.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <arpa/inet.h>

int openSocket(int tcpport);
int listenToSocket(int listenfd, int makeChild, short (*checkP)(char *));
int listenToSocket(int listenfd, int makeChild);
int openCliSocket(char *host, int port, int noTCPdelay);
void closeSocket(int sockfd);

Expand Down
29 changes: 2 additions & 27 deletions src/vcontrold.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ void printHelp(int socketfd);
int rawModus (int socketfd, char *device);
static void sigPipeHandler(int signo);
static void sigHupHandler(int signo);
short checkIP(char *ip);
int reloadConfig();

void usage()
Expand All @@ -96,19 +95,6 @@ void usage()
exit(1);
}

short checkIP(char *ip)
{
allowPtr aPtr;

if ((aPtr = getAllowNode(cfgPtr->aPtr, inet_addr(ip)))) {
logIT(LOG_INFO, "%s in allowList (%s)", ip, aPtr->text);
return 1;
} else {
logIT(LOG_INFO, "%s not in allowList", ip);
return 0;
}
}

int reloadConfig()
{
if (parseXMLFile(xmlfile)) {
Expand Down Expand Up @@ -890,18 +876,7 @@ int main(int argc, char *argv[])
}

int sockfd = -1;
int listenfd = -1;
// Pointer to the checkIP function
short (*checkP)(char *);

if (cfgPtr->aPtr) {
// We have an allow list
checkP = checkIP;
} else {
checkP = NULL;
}

listenfd = openSocket(tcpport);
int listenfd = openSocket(tcpport);

// Drop privileges after binding
if (0 == getuid()) {
Expand Down Expand Up @@ -967,7 +942,7 @@ int main(int argc, char *argv[])
vcontrol_seminit();

while (1) {
sockfd = listenToSocket(listenfd, makeDaemon, checkP);
sockfd = listenToSocket(listenfd, makeDaemon);
if (signal(SIGPIPE, sigPipeHandler) == SIG_ERR) {
logIT1(LOG_ERR, "Signal error");
exit(1);
Expand Down
4 changes: 1 addition & 3 deletions src/vsim.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,11 @@
#define SERVERPORT 6578
int makeDaemon = 0;
int inetversion = 0;
short (*checkP)(char *) = NULL;
int readCmdFile(char *filename, char *result, int *resultLen, char *device );
int interactive(int socketfd, char *device);
void printHelp(int socketfd);
int rawModus (int socketfd, char *device);
static void sigPipeHandler(int signo);
short checkIP(char *ip);

void logIT (int class, char *string, ...)
{
Expand Down Expand Up @@ -158,7 +156,7 @@ int main(int argc, char *argv[])

listenfd = openSocket(SERVERPORT);
while (1) {
sockfd = listenToSocket(listenfd, makeDaemon, checkP);
sockfd = listenToSocket(listenfd, makeDaemon);
if (signal(SIGPIPE, sigPipeHandler) == SIG_ERR) {
logIT(LOG_ERR, "Signal error");
exit(1);
Expand Down
103 changes: 0 additions & 103 deletions src/xmlconfig.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ void removeMacroList(macroPtr ptr);
void removeCommandList(commandPtr ptr);
void removeDeviceList(devicePtr ptr);
void removeIcmdList(icmdPtr ptr);
void removeAllowList(allowPtr ptr);
void removeEnumList(enumPtr ptr);
void freeAllLists();

Expand Down Expand Up @@ -385,51 +384,6 @@ void removeIcmdList(icmdPtr ptr)
}
}

allowPtr getAllowNode(allowPtr ptr, const in_addr_t testIP)
{
if (! ptr) {
return NULL;
}

if ((ntohl(ptr->ip) & ptr->mask) == (ntohl(testIP) & ptr->mask)) {
return ptr;
}

return getAllowNode(ptr->next, testIP);
}

allowPtr newAllowNode(allowPtr ptr)
{
allowPtr nptr;
if (ptr && ptr->next) {
return newAllowNode(ptr->next);
}

nptr = calloc(1, sizeof(Allow));
if (! nptr) {
fprintf(stderr, "malloc failed\n");
exit(1);
}

if (ptr) {
ptr->next = nptr;
}

return nptr;
}

void removeAllowList(allowPtr ptr)
{
if (ptr && ptr->next) {
removeAllowList(ptr->next);
}

if (ptr) {
free(ptr->text);
free(ptr);
}
}

enumPtr newEnumNode(enumPtr ptr)
{
enumPtr nptr;
Expand Down Expand Up @@ -555,14 +509,12 @@ configPtr parseConfig(xmlNodePtr cur)
char *chrPtr;
xmlNodePtr prevPtr;
//char string[256];
allowPtr aPtr;
char ip[16];

cfgPtr = calloc(1, sizeof(Config));
cfgPtr->port = 0;
cfgPtr->syslog = 0;
cfgPtr->debug = 0;
cfgPtr->aPtr = NULL;

while (cur) {
logIT(LOG_INFO, "CONFIG:(%d) Node::Name=%s Type:%d Content=%s",
Expand Down Expand Up @@ -650,60 +602,6 @@ configPtr parseConfig(xmlNodePtr cur)
}
(cur->next && (! (cur->next->type == XML_TEXT_NODE) || cur->next->next))
? (cur = cur->next) : (cur = prevPtr->next);
} else if (netFound && strstr((char *)cur->name, "allow")) {
chrPtr = getPropertyNode(cur->properties, (xmlChar *)"ip");
logIT(LOG_INFO, " (%d) Node::Name=%s Type:%d Content=%s", cur->line, cur->name, cur->type, chrPtr);

// We now disassemble chrPtr to ip/size.
// If no mask is given, we assume /32.
// Afterwards, we build an inverse mask and put it in mask.
// ip == text content ip address mask == bitmask

char *ptr;
short count;
short size;
in_addr_t mask;

memset(ip, 0, sizeof(ip));
//memset(string, 0,sizeof(string));
if ((ptr = strchr(chrPtr, '/'))) {
#if 0
strncpy(string, ptr + 1, sizeof(string) - 1);
size = atoi(string);
#endif
size = atoi(ptr + 1);
strncpy(ip, chrPtr, ptr - chrPtr);
} else {
strncpy(ip, chrPtr, sizeof(ip) - 1);
size = 32;
}

if (inet_addr(ip) != INADDR_NONE) {
aPtr = newAllowNode(cfgPtr->aPtr);
aPtr->text = calloc(strlen(chrPtr) + 1, sizeof(char));
strcpy(aPtr->text, chrPtr);
mask = 0;
// We assemble a bitmask
if (size) {
mask = 0x80000000;
for (count = 0; count < size - 1; count++) {
mask >>= 1;
mask |= 0x80000000;
}
}
aPtr->mask = mask;
aPtr->ip = inet_addr(ip);

if (! cfgPtr->aPtr) {
cfgPtr->aPtr = aPtr;
}

logIT(LOG_INFO, " Allow IP:%s Size:/%d", ip, size);
}

(cur->next && (! (cur->next->type == XML_TEXT_NODE) || cur->next->next))
? (cur = cur->next) : (cur = prevPtr->next);

} else if (logFound && strstr((char *)cur->name, "file")) {
chrPtr = getTextNode(cur);
logIT(LOG_INFO, " (%d) Node::Name=%s Type:%d Content=%s",
Expand Down Expand Up @@ -1592,7 +1490,6 @@ void freeAllLists()
free(cfgPtr->tty);
free(cfgPtr->logfile);
free(cfgPtr->devID);
removeAllowList(cfgPtr->aPtr);
free(cfgPtr);
cfgPtr = NULL;
}
Expand Down
9 changes: 0 additions & 9 deletions src/xmlconfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,9 @@ int parseXMLFile(char *filename);
macroPtr getMacroNode(macroPtr ptr, const char *name);
unitPtr getUnitNode(unitPtr ptr, const char *name);
commandPtr getCommandNode(commandPtr ptr, const char *name);
allowPtr getAllowNode(allowPtr ptr, in_addr_t testIP);
enumPtr getEnumNode(enumPtr prt, char *search, int len);
icmdPtr getIcmdNode(icmdPtr ptr, const char *name);

struct allow {
char *text;
in_addr_t ip;
in_addr_t mask;
allowPtr next;
} Allow;

struct compile {
int token;
char *send;
Expand All @@ -63,7 +55,6 @@ struct config {
char *groupname;
char *devID;
devicePtr devPtr;
allowPtr aPtr;
int syslog;
int debug;
} Config;
Expand Down
2 changes: 0 additions & 2 deletions xml/300/vcontrold.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
</serial>
<net>
<port>3002</port>
<allow ip="127.0.0.1"/>
<allow ip="192.168.1.0/24"/>
</net>
<logging>
<file>vcontrold.log</file>
Expand Down
2 changes: 0 additions & 2 deletions xml/kw/vcontrold.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
</serial>
<net>
<port>3002</port>
<allow ip="127.0.0.1"/>
<allow ip="192.168.1.0/24"/>
</net>
<logging>
<file>/tmp/vcontrold.log</file>
Expand Down