/*
* SARG Squid Analysis Report Generator http://sarg.sourceforge.net
- * 1998, 2011
+ * 1998, 2015
*
* SARG donations:
* please look at http://sarg.sourceforge.net/donations.php
#include <ldap.h>
#include <ldap_cdefs.h>
#include <ldap_features.h>
+
+#if defined(HAVE_ICONV_H)
+#include <iconv.h>
+#define USE_ICONV 1
+#endif //HAVE_ICONV_H
+
#endif //HAVE_LDAP_H
enum UserTabEnum
static LDAP *ldap_handle=NULL;
#endif //HAVE_LDAP_H
+#ifdef USE_ICONV
+//! iconv conversion descriptor to convert the string returned by LDAP.
+static iconv_t ldapiconv=(iconv_t)-1;
+//! Buffer to store the converted string.
+static char *ldapconvbuffer=NULL;
+//! Size of the converted string buffer.
+static int ldapconvbuffersize=0;
+#endif
+
static void init_file_usertab(const char *UserTabFile)
{
FILE *fp_usr;
int z1, z2;
if((fp_usr=fopen(UserTabFile,"r"))==NULL) {
- debuga(_("(usertab) Cannot open file %s - %s\n"),UserTabFile,strerror(errno));
+ debuga(_("Cannot open file \"%s\": %s\n"),UserTabFile,strerror(errno));
exit(EXIT_FAILURE);
}
if (fseek(fp_usr, 0, SEEK_END)==-1) {
- debuga(_("Failed to move till the end of the usertab file %s: %s\n"),UserTabFile,strerror(errno));
+ debuga(_("Failed to move till the end of file \"%s\": %s\n"),UserTabFile,strerror(errno));
exit(EXIT_FAILURE);
}
nreg = ftell(fp_usr);
if (nreg<0) {
- debuga(_("Cannot get the size of file %s\n"),UserTabFile);
+ debuga(_("Cannot get the size of file \"%s\"\n"),UserTabFile);
exit(EXIT_FAILURE);
}
nreg += 100;
if (fseek(fp_usr, 0, SEEK_SET)==-1) {
- debuga(_("Failed to rewind the usertab file %s: %s\n"),UserTabFile,strerror(errno));
+ debuga(_("Failed to rewind file \"%s\": %s\n"),UserTabFile,strerror(errno));
exit(EXIT_FAILURE);
}
if((userfile=(char *) malloc(nreg))==NULL){
z1=0;
while(buf[z1] && (unsigned char)buf[z1]>' ') {
if (z2+3>=nreg) { //need at least 3 additional bytes for the minimum string "\n\t\0"
- debuga(_("The list of the users is too long in your %s file.\n"),UserTabFile);
+ debuga(_("The list of users is too long in file \"%s\"\n"),UserTabFile);
exit(EXIT_FAILURE);
}
userfile[z2++]=buf[z1++];
userfile[z2++]='\n';
while(buf[z1] && (unsigned char)buf[z1]>=' ') {
if (z2+2>=nreg) { //need at least 2 additional bytes for "\t\0"
- debuga(_("The list of the users is too long in your %s file.\n"),UserTabFile);
+ debuga(_("The list of users is too long in file \"%s\"\n"),UserTabFile);
exit(EXIT_FAILURE);
}
userfile[z2++]=buf[z1++];
userfile[z2++]='\t';
}
userfile[z2]='\0';
- fclose(fp_usr);
+ if (fclose(fp_usr)==EOF) {
+ debuga(_("Read error in \"%s\": %s\n"),UserTabFile,strerror(errno));
+ exit(EXIT_FAILURE);
+ }
}
static void get_usertab_name(const char *user,char *name,int namelen)
exit(EXIT_FAILURE);
}
+#ifdef USE_ICONV
+ // prepare for the string conversion
+ if (LDAPNativeCharset[0]!='\0') {
+ ldapiconv = iconv_open( LDAPNativeCharset, "UTF-8" );
+ if (ldapiconv==(iconv_t)-1) {
+ debuga(_("iconv cannot convert from UTF-8 to %s: %s\n"),LDAPNativeCharset,strerror(errno));
+ exit(EXIT_FAILURE);
+ }
+ }
+ ldapconvbuffer=NULL;
+ ldapconvbuffersize=0;
+#endif
+
/* Initializing cache */
init_cache();
}
+const char * charset_convert( const char * str_in, const char * charset_to )
+{
+#ifdef USE_ICONV
+ size_t return_value;
+ const char * str_in_orig;
+ char * str_out;
+ size_t str_in_len;
+ size_t str_out_len;
+
+ str_in_len = strlen( str_in ) + 1;//process the terminating NUL too
+ str_out_len = ( 2 * str_in_len );
+ if (ldapconvbuffer==NULL || ldapconvbuffersize<str_out_len) {
+ ldapconvbuffersize=str_out_len;
+ str_out = realloc(ldapconvbuffer,ldapconvbuffersize);
+ if (!str_out) {
+ debuga(_("Not enough memory to convert a LDAP returned string: %lu bytes required\n"),(unsigned long int)str_out_len);
+ exit(EXIT_FAILURE);
+ }
+ ldapconvbuffer = str_out;
+ } else {
+ str_out = ldapconvbuffer;
+ str_out_len = ldapconvbuffersize;
+ }
+ str_in_orig = str_in;
+ return_value = iconv(ldapiconv, (ICONV_CONST char **)&str_in, &str_in_len, &str_out, &str_out_len );
+ if ( return_value == ( size_t ) -1 ) {
+ /* TRANSLATORS: The message is followed by the reason for the failure. */
+ debuga(_("iconv failed on string \"%s\":\n"),str_in_orig);
+ switch ( errno ) {
+ /* See "man 3 iconv" for an explanation. */
+ case EILSEQ:
+ debuga(_("Invalid multibyte sequence.\n"));
+ break;
+ case EINVAL:
+ debuga(_("Incomplete multibyte sequence.\n"));
+ break;
+ case E2BIG:
+ debuga(_("No more room.\n"));
+ break;
+ default:
+ debuga(_("Error: %s.\n"),strerror( errno ));
+ }
+ exit(EXIT_FAILURE);
+ }
+ return(ldapconvbuffer);
+#else //USE_ICONV
+ return(str_in);
+#endif //USE_ICONV
+}
+
static void get_ldap_name(const char *userlogin,char *mappedname,int namelen)
{
/* Start searching username in cache */
char filtersearch[256], *searched_in_cache;
char searchloginname[3*MAX_USER_LEN];
char *attr, **vals;
+ const char *attr_out;
const char *ptr;
LDAPMessage *result, *e;
BerElement *ber;
attrs[1]=NULL;
rc= ldap_search_ext_s(ldap_handle, LDAPBaseSearch, LDAP_SCOPE_SUBTREE, filtersearch, attrs, 0, NULL, NULL, NULL, -1, &result);
if (rc != LDAP_SUCCESS) {
- debuga(_("LDAP search failed: %s\n"), ldap_err2string(rc));
- debuga(_("looking for \"%s\" at or below \"%s\"\n"),filtersearch,LDAPBaseSearch);
+ debuga(_("LDAP search failed: %s\nlooking for \"%s\" at or below \"%s\"\n"), ldap_err2string(rc),filtersearch,LDAPBaseSearch);
safe_strcpy(mappedname,userlogin,namelen);
return;
}
for (attr = ldap_first_attribute(ldap_handle, e, &ber); attr != NULL; attr = ldap_next_attribute(ldap_handle, e, ber)) {
if (!strcasecmp(attr, LDAPTargetAttr)) {
if ((vals = (char **)ldap_get_values(ldap_handle, e, attr))!=NULL) {
- insert_to_cache(userlogin, vals[0]);
- safe_strcpy(mappedname, vals[0],namelen);
+ attr_out = charset_convert( vals[0], LDAPNativeCharset );
+ insert_to_cache(userlogin, attr_out);
+ safe_strcpy(mappedname, attr_out, namelen);
ldap_memfree(vals);
}
ldap_memfree(attr);
void init_usertab(const char *UserTabFile)
{
if (strcmp(UserTabFile, "ldap") == 0) {
- if(debug)
- debuga(_("Loading User table: %s\n"),UserTabFile);
+ if(debug) {
+ /* TRANSLATORS: The %s may be the string "ldap" or a file name.*/
+ debuga(_("Loading User table from \"%s\"\n"),UserTabFile);
+ }
#ifdef HAVE_LDAP_H
which_usertab=UTT_Ldap;
init_ldap_usertab();
#endif //HAVE_LDAP_H
} else if (UserTabFile[0] != '\0') {
if(debug)
- debuga(_("Loading User table: %s\n"),UserTabFile);
+ debuga(_("Loading User table from \"%s\"\n"),UserTabFile);
which_usertab=UTT_File;
init_file_usertab(UserTabFile);
} else {
ldap_handle=NULL;
}
#endif //HAVE_LDAP_H
+#ifdef USE_ICONV
+ if (ldapiconv!=(iconv_t)-1) {
+ iconv_close (ldapiconv);
+ ldapiconv=(iconv_t)-1;
+ }
+ if (ldapconvbuffer) {
+ free(ldapconvbuffer);
+ ldapconvbuffer=NULL;
+ }
+#endif // USE_ICONV
if(userfile) {
free(userfile);
userfile=NULL;
projects / thirdparty / sarg.git / blobdiff