diff options
author | Manuel Schneider | 2014-12-03 16:51:15 +0100 |
---|---|---|
committer | Manuel Schneider | 2014-12-03 16:51:15 +0100 |
commit | aa29395d1620cd594122ec75886db14633009f66 (patch) | |
tree | 573b505afeeea9199a64f13c45596c9588d6471f | |
parent | Fix printing problems (diff) | |
download | printergui-aa29395d1620cd594122ec75886db14633009f66.tar.gz printergui-aa29395d1620cd594122ec75886db14633009f66.tar.xz printergui-aa29395d1620cd594122ec75886db14633009f66.zip |
Fix intention
-rw-r--r-- | src/pwgui/main.cpp | 790 |
1 files changed, 395 insertions, 395 deletions
diff --git a/src/pwgui/main.cpp b/src/pwgui/main.cpp index 1be1849..e673108 100644 --- a/src/pwgui/main.cpp +++ b/src/pwgui/main.cpp @@ -47,175 +47,175 @@ static void helper_messageBox(const char *caption, const char *text, const bool int main(int argc, char *argv[]) { - char tmpfile[NAMELEN]; - char device[NAMELEN]; - char backend[NAMELEN]; - int spoolres; - - // Pretty much what smbspool does, but in a generalized way - if (argc > 2 && strstr(argv[0], ":/") == NULL && strstr(argv[1], ":/") != NULL) { - argv++; - argc--; - } - - // First check parameter count - if (argc != 6 && argc != 7) { - ERROR("Invalid number of arguments passed.\n"); - return CUPS_BACKEND_FAILED; - } - - // Determine device uri - char *env = getenv("DEVICE_URI"); - if (env != NULL && strchr(env, ':') != NULL) { - snprintf(device, NAMELEN, "%s", env); - } else if (strstr(argv[0], ":/") != NULL) { - snprintf(device, NAMELEN, "%s", argv[0]); - } else { - ERROR("No device URI given.\n"); - return CUPS_BACKEND_FAILED; - } - - // Get backend from uri - char *colon = strchr(device, ':'); - *colon = '\0'; - snprintf(backend, NAMELEN, "%s/%s", BACKEND_PATH, device); - *colon = ':'; - // Is valid? - if (access(backend, X_OK | R_OK) != 0) { - helper_getpiduid(argv[2], argv[3]); - helper_messageBox("PrinterGUI", "Kein Backend für den gewählten Drucker vorhanden."); - ERROR("Backend %s is not executable. Over and out.\n", backend); - return CUPS_BACKEND_FAILED; - } - - // argv[3] is title, get printergui pid from it - if (!helper_getpiduid(argv[2], argv[3])) { - // El cheapo validation failed. Don't enable "smart mode" (GUI etc), just exec real backend - ERROR("Dumb mode - will exec actual backend.\n"); + char tmpfile[NAMELEN]; + char device[NAMELEN]; + char backend[NAMELEN]; + int spoolres; + + // Pretty much what smbspool does, but in a generalized way + if (argc > 2 && strstr(argv[0], ":/") == NULL && strstr(argv[1], ":/") != NULL) { + argv++; + argc--; + } + + // First check parameter count + if (argc != 6 && argc != 7) { + ERROR("Invalid number of arguments passed.\n"); + return CUPS_BACKEND_FAILED; + } + + // Determine device uri + char *env = getenv("DEVICE_URI"); + if (env != NULL && strchr(env, ':') != NULL) { + snprintf(device, NAMELEN, "%s", env); + } else if (strstr(argv[0], ":/") != NULL) { + snprintf(device, NAMELEN, "%s", argv[0]); + } else { + ERROR("No device URI given.\n"); + return CUPS_BACKEND_FAILED; + } + + // Get backend from uri + char *colon = strchr(device, ':'); + *colon = '\0'; + snprintf(backend, NAMELEN, "%s/%s", BACKEND_PATH, device); + *colon = ':'; + // Is valid? + if (access(backend, X_OK | R_OK) != 0) { + helper_getpiduid(argv[2], argv[3]); + helper_messageBox("PrinterGUI", "Kein Backend für den gewählten Drucker vorhanden."); + ERROR("Backend %s is not executable. Over and out.\n", backend); + return CUPS_BACKEND_FAILED; + } + + // argv[3] is title, get printergui pid from it + if (!helper_getpiduid(argv[2], argv[3])) { + // El cheapo validation failed. Don't enable "smart mode" (GUI etc), just exec real backend + ERROR("Dumb mode - will exec actual backend.\n"); // Mimic cups behaviour wrt dropping privs (Only 0700 or 0500 == root) helper_loadlpuser(); struct stat st; if (stat(backend, &st) != 0 || (st.st_mode & 0011) != 0) helper_dropprivs(); - WARNING("Over and out.\n"); - execv(backend, argv); - exit(127); - } - kill(pid, SIGTERM); - - // Get document to print - if (argc == 6) { - // Data comes from stdin, save... - snprintf(tmpfile, NAMELEN, "/tmp/print-%s-%d-%s-%d", argv[1], (int)time(NULL), argv[2], (int)getpid()); - int fh = open(tmpfile, O_CREAT | O_WRONLY | O_TRUNC, 0600); - if (fh < 0) { - helper_messageBox("PrinterGUI", "Konnte temporäre Datei für den Druckjob nicht anlegen."); - ERROR("Could not open %s for writing. Over and out.\n", tmpfile); - return CUPS_BACKEND_FAILED; - } - char buffer[BUFLEN]; - int bytes, ret; - int total = 0; - for (;;) { - bytes = read(STDIN_FILENO, buffer, BUFLEN); - if (bytes == 0) break; - if (bytes < 0) { - helper_messageBox("PrinterGUI", "Konnte den Druckjob nicht auf STDIN empfangen."); - ERROR("Could not read print job from STDIN. Over and out.\n"); - remove(tmpfile); - return CUPS_BACKEND_FAILED; - } - if ((ret = write(fh, buffer, bytes)) != bytes) { - helper_messageBox("PrinterGUI", "Konnte Druckjob nicht in temporäre Datei schreiben."); - ERROR("Could not write %d bytes to %s (wrote %d). Over and out.\n", (int)bytes, tmpfile, (int)ret); - remove(tmpfile); - return CUPS_BACKEND_FAILED; - } - total += bytes; - } - close(fh); - DEBUG("Read %d bytes from stdin.\n", total); - // - } else { - // File given, check if file exists - snprintf(tmpfile, NAMELEN, "%s", argv[6]); - int fh = open(tmpfile, O_RDONLY); - if (fh < 0) { - helper_messageBox("PrinterGUI", "Konnte den Druckjob nicht vom Dateisystem lesen."); - ERROR("Could not open %s for reading. Over and out.\n", tmpfile); - return CUPS_BACKEND_FAILED; - } - close(fh); - // - } - chown(tmpfile, ruid, rgid); - - // Try right away with what we got - spoolres = run_backend(backend, device, argv[1], argv[2], argv[3], argv[4], argv[5], tmpfile, NULL); - if (spoolres != CUPS_BACKEND_AUTH_REQUIRED) return helper_cupsError(spoolres); // Yay - - // Seems we need the dialog - int status; - char creds[NAMELEN], *pass = NULL; - snprintf(creds, NAMELEN, "%s", argv[2]); - do { - WARNING("Direct printing failed. Opening PW dialog....\n"); - int pfd[2]; - if (pipe(pfd) != 0) { - helper_messageBox("PrinterGUI", "Konnte pipe für die GUI nicht anlegen."); - ERROR("Could not create pipe for GUI. Over and out.\n"); - return CUPS_BACKEND_FAILED; - } - const pid_t pid = fork(); - if (pid == 0) { - // Child - GUI - close(pfd[0]); - helper_dropprivs(); - helper_copyenv(); - QApplication a(argc, argv); - PwGui w(pfd[1], creds); - w.show(); - exit(a.exec()); - return CUPS_BACKEND_FAILED; - } - // Main (Parent) - close(pfd[1]); - // Read from pipe - int bytes = read(pfd[0], creds, NAMELEN - 1); - close(pfd[0]); - // Wait for child to die - waitpid(pid, NULL, 0); // Don't check status, just look at pipe data - if (bytes <= 0) { // Probably means user pressed cancel - helper_messageBox("PrinterGUI", "Druckauftrag abgebrochen."); - ERROR("Could not read anything from pipe after showing GUI. Over and out.\n"); - remove(tmpfile); - return CUPS_BACKEND_CANCEL; - } - creds[bytes] = '\0'; - int len = strlen(creds); - if (len < bytes) pass = creds + len + 1; - // Run backend with pimped user/pass - status = run_backend(backend, device, argv[1], creds, argv[3], argv[4], argv[5], tmpfile, pass); - helper_cupsError(status); - } while (status != CUPS_BACKEND_OK); - remove(tmpfile); - ERROR("Job submitted. Over and out.\n"); - return CUPS_BACKEND_OK; + WARNING("Over and out.\n"); + execv(backend, argv); + exit(127); + } + kill(pid, SIGTERM); + + // Get document to print + if (argc == 6) { + // Data comes from stdin, save... + snprintf(tmpfile, NAMELEN, "/tmp/print-%s-%d-%s-%d", argv[1], (int)time(NULL), argv[2], (int)getpid()); + int fh = open(tmpfile, O_CREAT | O_WRONLY | O_TRUNC, 0600); + if (fh < 0) { + helper_messageBox("PrinterGUI", "Konnte temporäre Datei für den Druckjob nicht anlegen."); + ERROR("Could not open %s for writing. Over and out.\n", tmpfile); + return CUPS_BACKEND_FAILED; + } + char buffer[BUFLEN]; + int bytes, ret; + int total = 0; + for (;;) { + bytes = read(STDIN_FILENO, buffer, BUFLEN); + if (bytes == 0) break; + if (bytes < 0) { + helper_messageBox("PrinterGUI", "Konnte den Druckjob nicht auf STDIN empfangen."); + ERROR("Could not read print job from STDIN. Over and out.\n"); + remove(tmpfile); + return CUPS_BACKEND_FAILED; + } + if ((ret = write(fh, buffer, bytes)) != bytes) { + helper_messageBox("PrinterGUI", "Konnte Druckjob nicht in temporäre Datei schreiben."); + ERROR("Could not write %d bytes to %s (wrote %d). Over and out.\n", (int)bytes, tmpfile, (int)ret); + remove(tmpfile); + return CUPS_BACKEND_FAILED; + } + total += bytes; + } + close(fh); + DEBUG("Read %d bytes from stdin.\n", total); + // + } else { + // File given, check if file exists + snprintf(tmpfile, NAMELEN, "%s", argv[6]); + int fh = open(tmpfile, O_RDONLY); + if (fh < 0) { + helper_messageBox("PrinterGUI", "Konnte den Druckjob nicht vom Dateisystem lesen."); + ERROR("Could not open %s for reading. Over and out.\n", tmpfile); + return CUPS_BACKEND_FAILED; + } + close(fh); + // + } + chown(tmpfile, ruid, rgid); + + // Try right away with what we got + spoolres = run_backend(backend, device, argv[1], argv[2], argv[3], argv[4], argv[5], tmpfile, NULL); + if (spoolres != CUPS_BACKEND_AUTH_REQUIRED) return helper_cupsError(spoolres); // Yay + + // Seems we need the dialog + int status; + char creds[NAMELEN], *pass = NULL; + snprintf(creds, NAMELEN, "%s", argv[2]); + do { + WARNING("Direct printing failed. Opening PW dialog....\n"); + int pfd[2]; + if (pipe(pfd) != 0) { + helper_messageBox("PrinterGUI", "Konnte pipe für die GUI nicht anlegen."); + ERROR("Could not create pipe for GUI. Over and out.\n"); + return CUPS_BACKEND_FAILED; + } + const pid_t pid = fork(); + if (pid == 0) { + // Child - GUI + close(pfd[0]); + helper_dropprivs(); + helper_copyenv(); + QApplication a(argc, argv); + PwGui w(pfd[1], creds); + w.show(); + exit(a.exec()); + return CUPS_BACKEND_FAILED; + } + // Main (Parent) + close(pfd[1]); + // Read from pipe + int bytes = read(pfd[0], creds, NAMELEN - 1); + close(pfd[0]); + // Wait for child to die + waitpid(pid, NULL, 0); // Don't check status, just look at pipe data + if (bytes <= 0) { // Probably means user pressed cancel + helper_messageBox("PrinterGUI", "Druckauftrag abgebrochen."); + ERROR("Could not read anything from pipe after showing GUI. Over and out.\n"); + remove(tmpfile); + return CUPS_BACKEND_CANCEL; + } + creds[bytes] = '\0'; + int len = strlen(creds); + if (len < bytes) pass = creds + len + 1; + // Run backend with pimped user/pass + status = run_backend(backend, device, argv[1], creds, argv[3], argv[4], argv[5], tmpfile, pass); + helper_cupsError(status); + } while (status != CUPS_BACKEND_OK); + remove(tmpfile); + ERROR("Job submitted. Over and out.\n"); + return CUPS_BACKEND_OK; } static int run_backend(char *backend, char *uri, char *jobid, char *user, char *title, char *copies, char *options, char *file, char *password) { - int pipefd[2]; - pipe(pipefd); - pid_t pid = fork(); - if (pid == 0) { - // Child - close(pipefd[0]); // close reading end - dup2(pipefd[1], 2); // send stderr to pipe - close(pipefd[1]); // no longer needed after dup - // Newer backend can read credentials from environment - if (user != NULL) setenv("AUTH_USERNAME", user, 1); - if (password != NULL) setenv("AUTH_PASSWORD", password, 1); + int pipefd[2]; + pipe(pipefd); + pid_t pid = fork(); + if (pid == 0) { + // Child + close(pipefd[0]); // close reading end + dup2(pipefd[1], 2); // send stderr to pipe + close(pipefd[1]); // no longer needed after dup + // Newer backend can read credentials from environment + if (user != NULL) setenv("AUTH_USERNAME", user, 1); + if (password != NULL) setenv("AUTH_PASSWORD", password, 1); // Compute proper string length int len = strlen(uri) + 20 + strlen("?waitprinter=no&waitjob=no"); @@ -229,15 +229,15 @@ static int run_backend(char *backend, char *uri, char *jobid, char *user, char * // For ipp14 (at least) we need to build a new URI with ://username:password@.... if (user != NULL && password != NULL && strncmp(uri, "ipp14:", 6) == 0) { - char *ptr = newstr; - ptr += sprintf(ptr, "ipp14://"); - ptr = helper_urlencode(user, ptr); - *ptr++ = ':'; - ptr = helper_urlencode(password, ptr); - *ptr++ = '@'; + char *ptr = newstr; + ptr += sprintf(ptr, "ipp14://"); + ptr = helper_urlencode(user, ptr); + *ptr++ = ':'; + ptr = helper_urlencode(password, ptr); + *ptr++ = '@'; ptr += sprintf(ptr, "%s", uri + 8); // TODO: If uri already contains credentials, skip over them (check if there's a @ before the first /, starting at index 8) - // Since we've already forked and execv anyways there's no need to clean up anything... - } + // Since we've already forked and execv anyways there's no need to clean up anything... + } else strcpy(newstr, uri); @@ -268,131 +268,131 @@ static int run_backend(char *backend, char *uri, char *jobid, char *user, char * setenv("DEVICE_URI", uri, 1); ERROR("DEVICE_URI: '%s'", uri); - char *args[8]; - args[0] = uri; - args[1] = jobid; - args[2] = user; - args[3] = title; - args[4] = copies; - args[5] = options; - args[6] = file; - args[7] = NULL; - // Priv dropping - struct stat st; - if (stat(backend, &st) != 0 || (st.st_mode & 0011) != 0) helper_dropprivs(); - // Exec - execv(backend, args); - exit(127); - return 127; - } - - // Main - wait for it... - close(pipefd[1]); // close writing end - char buffer[BUFLEN]; - bool needAuth = false; - bool nonexistent = false; - int readlen = 0; - while ((readlen = read(pipefd[0], buffer, BUFLEN-1)) > 0) { - buffer[readlen] = '\0'; + char *args[8]; + args[0] = uri; + args[1] = jobid; + args[2] = user; + args[3] = title; + args[4] = copies; + args[5] = options; + args[6] = file; + args[7] = NULL; + // Priv dropping + struct stat st; + if (stat(backend, &st) != 0 || (st.st_mode & 0011) != 0) helper_dropprivs(); + // Exec + execv(backend, args); + exit(127); + return 127; + } + + // Main - wait for it... + close(pipefd[1]); // close writing end + char buffer[BUFLEN]; + bool needAuth = false; + bool nonexistent = false; + int readlen = 0; + while ((readlen = read(pipefd[0], buffer, BUFLEN-1)) > 0) { + buffer[readlen] = '\0'; ERROR("BACKEND: %s\n", buffer); - if (strstr(buffer, "Unable to get printer status (Unauthorized)") != NULL) { - needAuth = true; - if (kill(pid, SIGTERM) < 0) { - ERROR("Sending SIGTERM to backend %d failed: %d\n", (int)pid, errno); - } - break; - } else if (strstr(buffer, "Destination printer does not exist") != NULL) { - nonexistent = true; - kill(pid, SIGTERM); - break; - } - } - close(pipefd[0]); - int status; - if (waitpid(pid, &status, WNOHANG) == 0) { - if (kill(pid, SIGKILL) == 0) { - // Try to reap zombie - sleep(1); - waitpid(pid, &status, WNOHANG); - } - } - if (needAuth) { - ERROR("Killed backend because of 'unauthorized' message (iprint crap?), trying with auth\n"); - return CUPS_BACKEND_AUTH_REQUIRED; - } - if (nonexistent) { - ERROR("Destination printer does not exist!\n"); - return CUSTOM_CUPS_NO_SUCH_PRINTER; - } - if (!WIFEXITED(status)) { - ERROR("Running backend %s failed!\n", backend); - return CUPS_BACKEND_FAILED; - } - status = WEXITSTATUS(status); - if (status != CUPS_BACKEND_OK) ERROR("Backend returned %d\n", status); - return status; + if (strstr(buffer, "Unable to get printer status (Unauthorized)") != NULL) { + needAuth = true; + if (kill(pid, SIGTERM) < 0) { + ERROR("Sending SIGTERM to backend %d failed: %d\n", (int)pid, errno); + } + break; + } else if (strstr(buffer, "Destination printer does not exist") != NULL) { + nonexistent = true; + kill(pid, SIGTERM); + break; + } + } + close(pipefd[0]); + int status; + if (waitpid(pid, &status, WNOHANG) == 0) { + if (kill(pid, SIGKILL) == 0) { + // Try to reap zombie + sleep(1); + waitpid(pid, &status, WNOHANG); + } + } + if (needAuth) { + ERROR("Killed backend because of 'unauthorized' message (iprint crap?), trying with auth\n"); + return CUPS_BACKEND_AUTH_REQUIRED; + } + if (nonexistent) { + ERROR("Destination printer does not exist!\n"); + return CUSTOM_CUPS_NO_SUCH_PRINTER; + } + if (!WIFEXITED(status)) { + ERROR("Running backend %s failed!\n", backend); + return CUPS_BACKEND_FAILED; + } + status = WEXITSTATUS(status); + if (status != CUPS_BACKEND_OK) ERROR("Backend returned %d\n", status); + return status; } static bool helper_getpiduid(char *user, char *title) { - // it has to be gui-<PID>, PID has to be an instance of printergui - // and we have to be able to kill it, only then we assume we should bother the user - // with an authentication dialog - if (strncmp(title, "gui-", 4) != 0) { - WARNING("Job Title doesnt start with 'gui-' (Is: %s)\n", title); - return false; // Wrong job title - } - int p = atoi(title + 4); - struct stat st; - struct passwd *pw = getpwnam(user); - if (pw == NULL) { - WARNING("Cannot getpwnam %s\n", user); - return false; - } - char bin[PATH_MAX+1], tmp[100]; - snprintf(tmp, 100, "/proc/%d/exe", p); - if (realpath(tmp, bin) == NULL) { - WARNING("Cannot get realpath of %s\n", tmp); - return false; - } - char *last = strrchr(bin, '/'); - if (last == NULL || strcmp(last, "/printergui") != 0) { - WARNING("%s does not end in /printergui\n", bin); - return false; // Wrong process - } - // PID passed via job title seems to be the printergui - if (lstat(tmp, &st) < 0) { - WARNING("Could not lstat() %s\n", tmp); - return false; - } - if (st.st_uid != pw->pw_uid) { - WARNING("Owner of %s: %d, owner of job: %d (%s)\n", tmp, (int)st.st_uid, (int)pw->pw_uid, user); - return false; // Print job user doesn't match printergui process owner - } - // All checks passed, make stuff global - pid = p; - ruid = pw->pw_uid; - rgid = pw->pw_gid; - snprintf(ruser, NAMELEN, "%s", user); - // Finally, try to copy the environment of the process - snprintf(tmp, 100, "/proc/%d/environ", p); - int fh = open(tmp, O_RDONLY); - if (fh >= 0) { - char *ptr = gui_env; - int bytes = 0, ret; - while ((ret = read(fh, ptr, ENVLEN - (ptr - gui_env) - 2)) > 0) { - bytes += ret; - ptr += ret; - if (bytes + 3 >= ENVLEN) break; - } - close(fh); - if (bytes >= 0) { - gui_env[bytes+0] = '\0'; - gui_env[bytes+1] = '\0'; - } - } - DEBUG("getpiduid successful!\n"); - return true; + // it has to be gui-<PID>, PID has to be an instance of printergui + // and we have to be able to kill it, only then we assume we should bother the user + // with an authentication dialog + if (strncmp(title, "gui-", 4) != 0) { + WARNING("Job Title doesnt start with 'gui-' (Is: %s)\n", title); + return false; // Wrong job title + } + int p = atoi(title + 4); + struct stat st; + struct passwd *pw = getpwnam(user); + if (pw == NULL) { + WARNING("Cannot getpwnam %s\n", user); + return false; + } + char bin[PATH_MAX+1], tmp[100]; + snprintf(tmp, 100, "/proc/%d/exe", p); + if (realpath(tmp, bin) == NULL) { + WARNING("Cannot get realpath of %s\n", tmp); + return false; + } + char *last = strrchr(bin, '/'); + if (last == NULL || strcmp(last, "/printergui") != 0) { + WARNING("%s does not end in /printergui\n", bin); + return false; // Wrong process + } + // PID passed via job title seems to be the printergui + if (lstat(tmp, &st) < 0) { + WARNING("Could not lstat() %s\n", tmp); + return false; + } + if (st.st_uid != pw->pw_uid) { + WARNING("Owner of %s: %d, owner of job: %d (%s)\n", tmp, (int)st.st_uid, (int)pw->pw_uid, user); + return false; // Print job user doesn't match printergui process owner + } + // All checks passed, make stuff global + pid = p; + ruid = pw->pw_uid; + rgid = pw->pw_gid; + snprintf(ruser, NAMELEN, "%s", user); + // Finally, try to copy the environment of the process + snprintf(tmp, 100, "/proc/%d/environ", p); + int fh = open(tmp, O_RDONLY); + if (fh >= 0) { + char *ptr = gui_env; + int bytes = 0, ret; + while ((ret = read(fh, ptr, ENVLEN - (ptr - gui_env) - 2)) > 0) { + bytes += ret; + ptr += ret; + if (bytes + 3 >= ENVLEN) break; + } + close(fh); + if (bytes >= 0) { + gui_env[bytes+0] = '\0'; + gui_env[bytes+1] = '\0'; + } + } + DEBUG("getpiduid successful!\n"); + return true; } static bool helper_loadlpuser() @@ -406,32 +406,32 @@ static bool helper_loadlpuser() static void helper_dropprivs() { - if (ruid == 0) return; + if (ruid == 0) return; initgroups(ruser, rgid); setgid(rgid); setuid(ruid); ERROR("Set UID to %d and GID to %d.\n", (int)getuid(),(int)getgid()); - chdir("/"); - if (setuid(0) != -1) { - ERROR("setuid-fu!?\n"); - exit(CUPS_BACKEND_FAILED); - } + chdir("/"); + if (setuid(0) != -1) { + ERROR("setuid-fu!?\n"); + exit(CUPS_BACKEND_FAILED); + } } static void helper_copyenv() { - char *ptr = gui_env; - while (strlen(ptr) > 0) { - char *equal = strchr(ptr, '='); - if (equal != NULL) { - char *value = equal + 1; - *equal = '\0'; - setenv(ptr, value, 1); - DEBUG("Setting Env: '%s' = '%s'\n", ptr, value); - *equal = '='; - } - ptr += strlen(ptr) + 1; - } + char *ptr = gui_env; + while (strlen(ptr) > 0) { + char *equal = strchr(ptr, '='); + if (equal != NULL) { + char *value = equal + 1; + *equal = '\0'; + setenv(ptr, value, 1); + DEBUG("Setting Env: '%s' = '%s'\n", ptr, value); + *equal = '='; + } + ptr += strlen(ptr) + 1; + } } /** @@ -439,25 +439,25 @@ static void helper_copyenv() */ static char *helper_urlencode(char *source, char *enc) { - static char table[256] = {3}; - int len; - - if (table[0] == 3) { - int i; - for (i = 0; i < 256; i++) { - table[i] = (isalnum(i) || i == '~' || i == '-' || i == '.' || i == '_') ? i : 0; - } - } - - unsigned char *s = (unsigned char*)source; - for (; *s != '\0'; s++) { - if (table[*s] != '\0') len = sprintf(enc, "%c", table[*s]); - else len = sprintf(enc, "%%%02X", *s); - enc += len; - } - *enc = '\0'; - - return enc; + static char table[256] = {3}; + int len; + + if (table[0] == 3) { + int i; + for (i = 0; i < 256; i++) { + table[i] = (isalnum(i) || i == '~' || i == '-' || i == '.' || i == '_') ? i : 0; + } + } + + unsigned char *s = (unsigned char*)source; + for (; *s != '\0'; s++) { + if (table[*s] != '\0') len = sprintf(enc, "%c", table[*s]); + else len = sprintf(enc, "%%%02X", *s); + enc += len; + } + *enc = '\0'; + + return enc; } /** @@ -467,79 +467,79 @@ static char *helper_urlencode(char *source, char *enc) */ static int helper_cupsError(const int code) { - switch (code) { - case CUPS_BACKEND_OK: - helper_messageBox("CUPS", "Der Druckauftrag wurde erfolgreich an den print server übermittelt", false); - return CUPS_BACKEND_OK; - - case CUPS_BACKEND_FAILED: - // The print file was not successfully transmitted to the device or remote server. The scheduler will respond to this by canceling the job, retrying the job, or stopping the queue depending on the state of the error-policy attribute. - helper_messageBox("CUPS Fehler", "Fehler beim lokalen Verarbeiten des Druckauftrags"); - return CUPS_BACKEND_HOLD; - - case CUPS_BACKEND_AUTH_REQUIRED: - // The print file was not successfully transmitted because valid authentication information is required. The scheduler will respond to this by holding the job and adding the "cups-held-for-authentication" keyword to the "job-reasons" attribute. - helper_messageBox("CUPS Fehler", "Authentifizierung am Druckserver/Drucker fehlgeschlagen"); - break; - - case CUPS_BACKEND_HOLD: - // The print file was not successfully transmitted because it cannot be printed at this time. The scheduler will respond to this by holding the job. - helper_messageBox("CUPS Fehler", "Der Drucker hat die Annahme des Druckauftrags verweigert (3)"); - break; - - case CUPS_BACKEND_STOP: - // The print file was not successfully transmitted because it cannot be printed at this time. The scheduler will respond to this by stopping the queue. - helper_messageBox("CUPS Fehler", "Der Drucker hat die Annahme des Druckauftrags verweigert (4)"); - return CUPS_BACKEND_HOLD; - - case CUPS_BACKEND_CANCEL: - // The print file was not successfully transmitted because one or more attributes are not supported or the job was canceled at the printer. The scheduler will respond to this by canceling the job. - helper_messageBox("CUPS Fehler", "Fehler 5 beim lokalen Verarbeiten des Druckauftrags"); - return CUPS_BACKEND_HOLD; - - case CUPS_BACKEND_RETRY: - // The print file was not successfully transmitted because of a temporary issue. The scheduler will retry the job at a future time - other jobs may print before this one. - helper_messageBox("CUPS Fehler", "Fehler 6 beim lokalen Verarbeiten des Druckauftrags"); - return CUPS_BACKEND_HOLD; - - case CUPS_BACKEND_RETRY_CURRENT: - // The print file was not successfully transmitted because of a temporary issue. The scheduler will retry the job immediately without allowing intervening jobs. - helper_messageBox("CUPS Fehler", "Fehler 7 beim lokalen Verarbeiten des Druckauftrags"); - return CUPS_BACKEND_HOLD; - - case CUSTOM_CUPS_NO_SUCH_PRINTER: - helper_messageBox("CUPS Fehler", "Die Druckerwarteschlange existiert nicht auf dem print server. Fehlerhafte lokale printers.conf?"); - return CUPS_BACKEND_CANCEL; - default: - ERROR("Unknown cupsError code %d\n", code); - helper_messageBox("CUPS Fehler", "Unbekannter Fehler beim Drucken", true); - break; - } - return code; + switch (code) { + case CUPS_BACKEND_OK: + helper_messageBox("CUPS", "Der Druckauftrag wurde erfolgreich an den print server übermittelt", false); + return CUPS_BACKEND_OK; + + case CUPS_BACKEND_FAILED: + // The print file was not successfully transmitted to the device or remote server. The scheduler will respond to this by canceling the job, retrying the job, or stopping the queue depending on the state of the error-policy attribute. + helper_messageBox("CUPS Fehler", "Fehler beim lokalen Verarbeiten des Druckauftrags"); + return CUPS_BACKEND_HOLD; + + case CUPS_BACKEND_AUTH_REQUIRED: + // The print file was not successfully transmitted because valid authentication information is required. The scheduler will respond to this by holding the job and adding the "cups-held-for-authentication" keyword to the "job-reasons" attribute. + helper_messageBox("CUPS Fehler", "Authentifizierung am Druckserver/Drucker fehlgeschlagen"); + break; + + case CUPS_BACKEND_HOLD: + // The print file was not successfully transmitted because it cannot be printed at this time. The scheduler will respond to this by holding the job. + helper_messageBox("CUPS Fehler", "Der Drucker hat die Annahme des Druckauftrags verweigert (3)"); + break; + + case CUPS_BACKEND_STOP: + // The print file was not successfully transmitted because it cannot be printed at this time. The scheduler will respond to this by stopping the queue. + helper_messageBox("CUPS Fehler", "Der Drucker hat die Annahme des Druckauftrags verweigert (4)"); + return CUPS_BACKEND_HOLD; + + case CUPS_BACKEND_CANCEL: + // The print file was not successfully transmitted because one or more attributes are not supported or the job was canceled at the printer. The scheduler will respond to this by canceling the job. + helper_messageBox("CUPS Fehler", "Fehler 5 beim lokalen Verarbeiten des Druckauftrags"); + return CUPS_BACKEND_HOLD; + + case CUPS_BACKEND_RETRY: + // The print file was not successfully transmitted because of a temporary issue. The scheduler will retry the job at a future time - other jobs may print before this one. + helper_messageBox("CUPS Fehler", "Fehler 6 beim lokalen Verarbeiten des Druckauftrags"); + return CUPS_BACKEND_HOLD; + + case CUPS_BACKEND_RETRY_CURRENT: + // The print file was not successfully transmitted because of a temporary issue. The scheduler will retry the job immediately without allowing intervening jobs. + helper_messageBox("CUPS Fehler", "Fehler 7 beim lokalen Verarbeiten des Druckauftrags"); + return CUPS_BACKEND_HOLD; + + case CUSTOM_CUPS_NO_SUCH_PRINTER: + helper_messageBox("CUPS Fehler", "Die Druckerwarteschlange existiert nicht auf dem print server. Fehlerhafte lokale printers.conf?"); + return CUPS_BACKEND_CANCEL; + default: + ERROR("Unknown cupsError code %d\n", code); + helper_messageBox("CUPS Fehler", "Unbekannter Fehler beim Drucken", true); + break; + } + return code; } static void helper_messageBox(const char *caption, const char *text, const bool error) { - WARNING("Trying to MsgBox: %s\n", text); - const pid_t pid = fork(); - if (pid == 0) { - // Child - Qt - char *argv[1]; - argv[0] = (char*)"bla"; - int argc = 1; - helper_dropprivs(); - helper_copyenv(); - QApplication a(argc, argv); - if (error) { - QMessageBox::critical(NULL, QString::fromUtf8(caption), QString::fromUtf8(text)); - } else { - QMessageBox::information(NULL, QString::fromUtf8(caption), QString::fromUtf8(text)); - } - exit(0); - return; - } - // Main (Parent) - // Wait for child to die - waitpid(pid, NULL, 0); + WARNING("Trying to MsgBox: %s\n", text); + const pid_t pid = fork(); + if (pid == 0) { + // Child - Qt + char *argv[1]; + argv[0] = (char*)"bla"; + int argc = 1; + helper_dropprivs(); + helper_copyenv(); + QApplication a(argc, argv); + if (error) { + QMessageBox::critical(NULL, QString::fromUtf8(caption), QString::fromUtf8(text)); + } else { + QMessageBox::information(NULL, QString::fromUtf8(caption), QString::fromUtf8(text)); + } + exit(0); + return; + } + // Main (Parent) + // Wait for child to die + waitpid(pid, NULL, 0); } |