2006-04-23 18:26:03 +00:00
|
|
|
/*
|
|
|
|
* Session logging.
|
|
|
|
*/
|
|
|
|
|
2001-12-14 14:57:50 +00:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <ctype.h>
|
|
|
|
|
|
|
|
#include <time.h>
|
|
|
|
#include <assert.h>
|
|
|
|
|
|
|
|
#include "putty.h"
|
|
|
|
|
|
|
|
/* log session to file stuff ... */
|
Refactor the LogContext type.
LogContext is now the owner of the logevent() function that back ends
and so forth are constantly calling. Previously, logevent was owned by
the Frontend, which would store the message into its list for the GUI
Event Log dialog (or print it to standard error, or whatever) and then
pass it _back_ to LogContext to write to the currently open log file.
Now it's the other way round: LogContext gets the message from the
back end first, writes it to its log file if it feels so inclined, and
communicates it back to the front end.
This means that lots of parts of the back end system no longer need to
have a pointer to a full-on Frontend; the only thing they needed it
for was logging, so now they just have a LogContext (which many of
them had to have anyway, e.g. for logging SSH packets or session
traffic).
LogContext itself also doesn't get a full Frontend pointer any more:
it now talks back to the front end via a little vtable of its own
called LogPolicy, which contains the method that passes Event Log
entries through, the old askappend() function that decides whether to
truncate a pre-existing log file, and an emergency function for
printing an especially prominent message if the log file can't be
created. One minor nice effect of this is that console and GUI apps
can implement that last function subtly differently, so that Unix
console apps can write it with a plain \n instead of the \r\n
(harmless but inelegant) that the old centralised implementation
generated.
One other consequence of this is that the LogContext has to be
provided to backend_init() so that it's available to backends from the
instant of creation, rather than being provided via a separate API
call a couple of function calls later, because backends have typically
started doing things that need logging (like making network
connections) before the call to backend_provide_logctx. Fortunately,
there's no case in the whole code base where we don't already have
logctx by the time we make a backend (so I don't actually remember why
I ever delayed providing one). So that shortens the backend API by one
function, which is always nice.
While I'm tidying up, I've also moved the printf-style logeventf() and
the handy logevent_and_free() into logging.c, instead of having copies
of them scattered around other places. This has also let me remove
some stub functions from a couple of outlying applications like
Pageant. Finally, I've removed the pointless "_tag" at the end of
LogContext's official struct name.
2018-10-10 18:26:18 +00:00
|
|
|
struct LogContext {
|
2002-10-26 12:58:13 +00:00
|
|
|
FILE *lgfp;
|
2005-02-18 22:03:15 +00:00
|
|
|
enum { L_CLOSED, L_OPENING, L_OPEN, L_ERROR } state;
|
2005-02-18 18:33:31 +00:00
|
|
|
bufchain queue;
|
2011-10-02 11:01:57 +00:00
|
|
|
Filename *currlogfilename;
|
Refactor the LogContext type.
LogContext is now the owner of the logevent() function that back ends
and so forth are constantly calling. Previously, logevent was owned by
the Frontend, which would store the message into its list for the GUI
Event Log dialog (or print it to standard error, or whatever) and then
pass it _back_ to LogContext to write to the currently open log file.
Now it's the other way round: LogContext gets the message from the
back end first, writes it to its log file if it feels so inclined, and
communicates it back to the front end.
This means that lots of parts of the back end system no longer need to
have a pointer to a full-on Frontend; the only thing they needed it
for was logging, so now they just have a LogContext (which many of
them had to have anyway, e.g. for logging SSH packets or session
traffic).
LogContext itself also doesn't get a full Frontend pointer any more:
it now talks back to the front end via a little vtable of its own
called LogPolicy, which contains the method that passes Event Log
entries through, the old askappend() function that decides whether to
truncate a pre-existing log file, and an emergency function for
printing an especially prominent message if the log file can't be
created. One minor nice effect of this is that console and GUI apps
can implement that last function subtly differently, so that Unix
console apps can write it with a plain \n instead of the \r\n
(harmless but inelegant) that the old centralised implementation
generated.
One other consequence of this is that the LogContext has to be
provided to backend_init() so that it's available to backends from the
instant of creation, rather than being provided via a separate API
call a couple of function calls later, because backends have typically
started doing things that need logging (like making network
connections) before the call to backend_provide_logctx. Fortunately,
there's no case in the whole code base where we don't already have
logctx by the time we make a backend (so I don't actually remember why
I ever delayed providing one). So that shortens the backend API by one
function, which is always nice.
While I'm tidying up, I've also moved the printf-style logeventf() and
the handy logevent_and_free() into logging.c, instead of having copies
of them scattered around other places. This has also let me remove
some stub functions from a couple of outlying applications like
Pageant. Finally, I've removed the pointless "_tag" at the end of
LogContext's official struct name.
2018-10-10 18:26:18 +00:00
|
|
|
LogPolicy *lp;
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 18:52:21 +00:00
|
|
|
Conf *conf;
|
|
|
|
int logtype; /* cached out of conf */
|
2002-10-26 12:58:13 +00:00
|
|
|
};
|
2001-12-14 14:57:50 +00:00
|
|
|
|
2015-08-08 12:35:44 +00:00
|
|
|
static Filename *xlatlognam(Filename *s, char *hostname, int port,
|
|
|
|
struct tm *tm);
|
2001-12-14 14:57:50 +00:00
|
|
|
|
|
|
|
/*
|
2005-02-18 18:33:31 +00:00
|
|
|
* Internal wrapper function which must be called for _all_ output
|
|
|
|
* to the log file. It takes care of opening the log file if it
|
|
|
|
* isn't open, buffering data if it's in the process of being
|
|
|
|
* opened asynchronously, etc.
|
2001-12-14 14:57:50 +00:00
|
|
|
*/
|
2019-02-06 20:48:03 +00:00
|
|
|
static void logwrite(LogContext *ctx, ptrlen data)
|
2001-12-14 14:57:50 +00:00
|
|
|
{
|
2005-02-18 18:33:31 +00:00
|
|
|
/*
|
2005-02-18 22:03:15 +00:00
|
|
|
* In state L_CLOSED, we call logfopen, which will set the state
|
|
|
|
* to one of L_OPENING, L_OPEN or L_ERROR. Hence we process all of
|
|
|
|
* those three _after_ processing L_CLOSED.
|
2005-02-18 18:33:31 +00:00
|
|
|
*/
|
2005-02-18 22:03:15 +00:00
|
|
|
if (ctx->state == L_CLOSED)
|
2005-02-18 18:33:31 +00:00
|
|
|
logfopen(ctx);
|
|
|
|
|
2005-02-18 22:03:15 +00:00
|
|
|
if (ctx->state == L_OPENING) {
|
2019-02-06 20:48:03 +00:00
|
|
|
bufchain_add(&ctx->queue, data.ptr, data.len);
|
2005-02-18 22:03:15 +00:00
|
|
|
} else if (ctx->state == L_OPEN) {
|
2005-02-18 18:33:31 +00:00
|
|
|
assert(ctx->lgfp);
|
2019-02-06 20:48:03 +00:00
|
|
|
if (fwrite(data.ptr, 1, data.len, ctx->lgfp) < data.len) {
|
2009-08-07 00:19:04 +00:00
|
|
|
logfclose(ctx);
|
|
|
|
ctx->state = L_ERROR;
|
Refactor the LogContext type.
LogContext is now the owner of the logevent() function that back ends
and so forth are constantly calling. Previously, logevent was owned by
the Frontend, which would store the message into its list for the GUI
Event Log dialog (or print it to standard error, or whatever) and then
pass it _back_ to LogContext to write to the currently open log file.
Now it's the other way round: LogContext gets the message from the
back end first, writes it to its log file if it feels so inclined, and
communicates it back to the front end.
This means that lots of parts of the back end system no longer need to
have a pointer to a full-on Frontend; the only thing they needed it
for was logging, so now they just have a LogContext (which many of
them had to have anyway, e.g. for logging SSH packets or session
traffic).
LogContext itself also doesn't get a full Frontend pointer any more:
it now talks back to the front end via a little vtable of its own
called LogPolicy, which contains the method that passes Event Log
entries through, the old askappend() function that decides whether to
truncate a pre-existing log file, and an emergency function for
printing an especially prominent message if the log file can't be
created. One minor nice effect of this is that console and GUI apps
can implement that last function subtly differently, so that Unix
console apps can write it with a plain \n instead of the \r\n
(harmless but inelegant) that the old centralised implementation
generated.
One other consequence of this is that the LogContext has to be
provided to backend_init() so that it's available to backends from the
instant of creation, rather than being provided via a separate API
call a couple of function calls later, because backends have typically
started doing things that need logging (like making network
connections) before the call to backend_provide_logctx. Fortunately,
there's no case in the whole code base where we don't already have
logctx by the time we make a backend (so I don't actually remember why
I ever delayed providing one). So that shortens the backend API by one
function, which is always nice.
While I'm tidying up, I've also moved the printf-style logeventf() and
the handy logevent_and_free() into logging.c, instead of having copies
of them scattered around other places. This has also let me remove
some stub functions from a couple of outlying applications like
Pageant. Finally, I've removed the pointless "_tag" at the end of
LogContext's official struct name.
2018-10-10 18:26:18 +00:00
|
|
|
lp_eventlog(ctx->lp, "Disabled writing session log "
|
|
|
|
"due to error while writing");
|
2009-08-07 00:19:04 +00:00
|
|
|
}
|
2005-02-18 22:03:15 +00:00
|
|
|
} /* else L_ERROR, so ignore the write */
|
2005-02-18 18:33:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Convenience wrapper on logwrite() which printf-formats the
|
|
|
|
* string.
|
|
|
|
*/
|
2018-09-11 14:17:16 +00:00
|
|
|
static void logprintf(LogContext *ctx, const char *fmt, ...)
|
2005-02-18 18:33:31 +00:00
|
|
|
{
|
|
|
|
va_list ap;
|
|
|
|
char *data;
|
|
|
|
|
|
|
|
va_start(ap, fmt);
|
|
|
|
data = dupvprintf(fmt, ap);
|
|
|
|
va_end(ap);
|
|
|
|
|
2019-02-06 20:48:03 +00:00
|
|
|
logwrite(ctx, ptrlen_from_asciz(data));
|
2005-02-18 18:33:31 +00:00
|
|
|
sfree(data);
|
2001-12-14 14:57:50 +00:00
|
|
|
}
|
|
|
|
|
2004-08-12 01:02:01 +00:00
|
|
|
/*
|
|
|
|
* Flush any open log file.
|
|
|
|
*/
|
2018-09-11 14:17:16 +00:00
|
|
|
void logflush(LogContext *ctx)
|
|
|
|
{
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 18:52:21 +00:00
|
|
|
if (ctx->logtype > 0)
|
2005-02-18 22:03:15 +00:00
|
|
|
if (ctx->state == L_OPEN)
|
2004-08-12 01:02:01 +00:00
|
|
|
fflush(ctx->lgfp);
|
|
|
|
}
|
|
|
|
|
2018-09-11 14:17:16 +00:00
|
|
|
static void logfopen_callback(void *vctx, int mode)
|
2005-02-18 18:33:31 +00:00
|
|
|
{
|
2018-09-11 14:17:16 +00:00
|
|
|
LogContext *ctx = (LogContext *)vctx;
|
2005-02-18 18:33:31 +00:00
|
|
|
char buf[256], *event;
|
|
|
|
struct tm tm;
|
|
|
|
const char *fmode;
|
Convert a lot of 'int' variables to 'bool'.
My normal habit these days, in new code, is to treat int and bool as
_almost_ completely separate types. I'm still willing to use C's
implicit test for zero on an integer (e.g. 'if (!blob.len)' is fine,
no need to spell it out as blob.len != 0), but generally, if a
variable is going to be conceptually a boolean, I like to declare it
bool and assign to it using 'true' or 'false' rather than 0 or 1.
PuTTY is an exception, because it predates the C99 bool, and I've
stuck to its existing coding style even when adding new code to it.
But it's been annoying me more and more, so now that I've decided C99
bool is an acceptable thing to require from our toolchain in the first
place, here's a quite thorough trawl through the source doing
'boolification'. Many variables and function parameters are now typed
as bool rather than int; many assignments of 0 or 1 to those variables
are now spelled 'true' or 'false'.
I managed this thorough conversion with the help of a custom clang
plugin that I wrote to trawl the AST and apply heuristics to point out
where things might want changing. So I've even managed to do a decent
job on parts of the code I haven't looked at in years!
To make the plugin's work easier, I pushed platform front ends
generally in the direction of using standard 'bool' in preference to
platform-specific boolean types like Windows BOOL or GTK's gboolean;
I've left the platform booleans in places they _have_ to be for the
platform APIs to work right, but variables only used by my own code
have been converted wherever I found them.
In a few places there are int values that look very like booleans in
_most_ of the places they're used, but have a rarely-used third value,
or a distinction between different nonzero values that most users
don't care about. In these cases, I've _removed_ uses of 'true' and
'false' for the return values, to emphasise that there's something
more subtle going on than a simple boolean answer:
- the 'multisel' field in dialog.h's list box structure, for which
the GTK front end in particular recognises a difference between 1
and 2 but nearly everything else treats as boolean
- the 'urgent' parameter to plug_receive, where 1 vs 2 tells you
something about the specific location of the urgent pointer, but
most clients only care about 0 vs 'something nonzero'
- the return value of wc_match, where -1 indicates a syntax error in
the wildcard.
- the return values from SSH-1 RSA-key loading functions, which use
-1 for 'wrong passphrase' and 0 for all other failures (so any
caller which already knows it's not loading an _encrypted private_
key can treat them as boolean)
- term->esc_query, and the 'query' parameter in toggle_mode in
terminal.c, which _usually_ hold 0 for ESC[123h or 1 for ESC[?123h,
but can also hold -1 for some other intervening character that we
don't support.
In a few places there's an integer that I haven't turned into a bool
even though it really _can_ only take values 0 or 1 (and, as above,
tried to make the call sites consistent in not calling those values
true and false), on the grounds that I thought it would make it more
confusing to imply that the 0 value was in some sense 'negative' or
bad and the 1 positive or good:
- the return value of plug_accepting uses the POSIXish convention of
0=success and nonzero=error; I think if I made it bool then I'd
also want to reverse its sense, and that's a job for a separate
piece of work.
- the 'screen' parameter to lineptr() in terminal.c, where 0 and 1
represent the default and alternate screens. There's no obvious
reason why one of those should be considered 'true' or 'positive'
or 'success' - they're just indices - so I've left it as int.
ssh_scp_recv had particularly confusing semantics for its previous int
return value: its call sites used '<= 0' to check for error, but it
never actually returned a negative number, just 0 or 1. Now the
function and its call sites agree that it's a bool.
In a couple of places I've renamed variables called 'ret', because I
don't like that name any more - it's unclear whether it means the
return value (in preparation) for the _containing_ function or the
return value received from a subroutine call, and occasionally I've
accidentally used the same variable for both and introduced a bug. So
where one of those got in my way, I've renamed it to 'toret' or 'retd'
(the latter short for 'returned') in line with my usual modern
practice, but I haven't done a thorough job of finding all of them.
Finally, one amusing side effect of doing this is that I've had to
separate quite a few chained assignments. It used to be perfectly fine
to write 'a = b = c = TRUE' when a,b,c were int and TRUE was just a
the 'true' defined by stdbool.h, that idiom provokes a warning from
gcc: 'suggest parentheses around assignment used as truth value'!
2018-11-02 19:23:19 +00:00
|
|
|
bool shout = false;
|
2005-02-18 18:33:31 +00:00
|
|
|
|
|
|
|
if (mode == 0) {
|
2005-02-18 22:03:15 +00:00
|
|
|
ctx->state = L_ERROR; /* disable logging */
|
2005-02-18 18:33:31 +00:00
|
|
|
} else {
|
2005-02-19 01:20:16 +00:00
|
|
|
fmode = (mode == 1 ? "ab" : "wb");
|
2018-10-29 19:50:29 +00:00
|
|
|
ctx->lgfp = f_open(ctx->currlogfilename, fmode, false);
|
2015-09-25 08:15:21 +00:00
|
|
|
if (ctx->lgfp) {
|
2005-02-18 22:03:15 +00:00
|
|
|
ctx->state = L_OPEN;
|
2015-09-25 08:15:21 +00:00
|
|
|
} else {
|
2005-02-18 22:03:15 +00:00
|
|
|
ctx->state = L_ERROR;
|
2018-10-29 19:50:29 +00:00
|
|
|
shout = true;
|
2015-09-25 08:15:21 +00:00
|
|
|
}
|
2005-02-18 18:33:31 +00:00
|
|
|
}
|
|
|
|
|
2018-10-29 19:57:31 +00:00
|
|
|
if (ctx->state == L_OPEN && conf_get_bool(ctx->conf, CONF_logheader)) {
|
2005-02-18 18:33:31 +00:00
|
|
|
/* Write header line into log file. */
|
|
|
|
tm = ltime();
|
|
|
|
strftime(buf, 24, "%Y.%m.%d %H:%M:%S", &tm);
|
|
|
|
logprintf(ctx, "=~=~=~=~=~=~=~=~=~=~=~= PuTTY log %s"
|
|
|
|
" =~=~=~=~=~=~=~=~=~=~=~=\r\n", buf);
|
|
|
|
}
|
|
|
|
|
|
|
|
event = dupprintf("%s session log (%s mode) to file: %s",
|
2009-08-30 11:09:22 +00:00
|
|
|
ctx->state == L_ERROR ?
|
|
|
|
(mode == 0 ? "Disabled writing" : "Error writing") :
|
|
|
|
(mode == 1 ? "Appending" : "Writing new"),
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 18:52:21 +00:00
|
|
|
(ctx->logtype == LGTYP_ASCII ? "ASCII" :
|
|
|
|
ctx->logtype == LGTYP_DEBUG ? "raw" :
|
|
|
|
ctx->logtype == LGTYP_PACKETS ? "SSH packets" :
|
|
|
|
ctx->logtype == LGTYP_SSHRAW ? "SSH raw data" :
|
2005-02-18 18:33:31 +00:00
|
|
|
"unknown"),
|
2011-10-02 11:01:57 +00:00
|
|
|
filename_to_str(ctx->currlogfilename));
|
Refactor the LogContext type.
LogContext is now the owner of the logevent() function that back ends
and so forth are constantly calling. Previously, logevent was owned by
the Frontend, which would store the message into its list for the GUI
Event Log dialog (or print it to standard error, or whatever) and then
pass it _back_ to LogContext to write to the currently open log file.
Now it's the other way round: LogContext gets the message from the
back end first, writes it to its log file if it feels so inclined, and
communicates it back to the front end.
This means that lots of parts of the back end system no longer need to
have a pointer to a full-on Frontend; the only thing they needed it
for was logging, so now they just have a LogContext (which many of
them had to have anyway, e.g. for logging SSH packets or session
traffic).
LogContext itself also doesn't get a full Frontend pointer any more:
it now talks back to the front end via a little vtable of its own
called LogPolicy, which contains the method that passes Event Log
entries through, the old askappend() function that decides whether to
truncate a pre-existing log file, and an emergency function for
printing an especially prominent message if the log file can't be
created. One minor nice effect of this is that console and GUI apps
can implement that last function subtly differently, so that Unix
console apps can write it with a plain \n instead of the \r\n
(harmless but inelegant) that the old centralised implementation
generated.
One other consequence of this is that the LogContext has to be
provided to backend_init() so that it's available to backends from the
instant of creation, rather than being provided via a separate API
call a couple of function calls later, because backends have typically
started doing things that need logging (like making network
connections) before the call to backend_provide_logctx. Fortunately,
there's no case in the whole code base where we don't already have
logctx by the time we make a backend (so I don't actually remember why
I ever delayed providing one). So that shortens the backend API by one
function, which is always nice.
While I'm tidying up, I've also moved the printf-style logeventf() and
the handy logevent_and_free() into logging.c, instead of having copies
of them scattered around other places. This has also let me remove
some stub functions from a couple of outlying applications like
Pageant. Finally, I've removed the pointless "_tag" at the end of
LogContext's official struct name.
2018-10-10 18:26:18 +00:00
|
|
|
lp_eventlog(ctx->lp, event);
|
2015-09-25 08:15:21 +00:00
|
|
|
if (shout) {
|
|
|
|
/*
|
|
|
|
* If we failed to open the log file due to filesystem error
|
|
|
|
* (as opposed to user action such as clicking Cancel in the
|
Refactor the LogContext type.
LogContext is now the owner of the logevent() function that back ends
and so forth are constantly calling. Previously, logevent was owned by
the Frontend, which would store the message into its list for the GUI
Event Log dialog (or print it to standard error, or whatever) and then
pass it _back_ to LogContext to write to the currently open log file.
Now it's the other way round: LogContext gets the message from the
back end first, writes it to its log file if it feels so inclined, and
communicates it back to the front end.
This means that lots of parts of the back end system no longer need to
have a pointer to a full-on Frontend; the only thing they needed it
for was logging, so now they just have a LogContext (which many of
them had to have anyway, e.g. for logging SSH packets or session
traffic).
LogContext itself also doesn't get a full Frontend pointer any more:
it now talks back to the front end via a little vtable of its own
called LogPolicy, which contains the method that passes Event Log
entries through, the old askappend() function that decides whether to
truncate a pre-existing log file, and an emergency function for
printing an especially prominent message if the log file can't be
created. One minor nice effect of this is that console and GUI apps
can implement that last function subtly differently, so that Unix
console apps can write it with a plain \n instead of the \r\n
(harmless but inelegant) that the old centralised implementation
generated.
One other consequence of this is that the LogContext has to be
provided to backend_init() so that it's available to backends from the
instant of creation, rather than being provided via a separate API
call a couple of function calls later, because backends have typically
started doing things that need logging (like making network
connections) before the call to backend_provide_logctx. Fortunately,
there's no case in the whole code base where we don't already have
logctx by the time we make a backend (so I don't actually remember why
I ever delayed providing one). So that shortens the backend API by one
function, which is always nice.
While I'm tidying up, I've also moved the printf-style logeventf() and
the handy logevent_and_free() into logging.c, instead of having copies
of them scattered around other places. This has also let me remove
some stub functions from a couple of outlying applications like
Pageant. Finally, I've removed the pointless "_tag" at the end of
LogContext's official struct name.
2018-10-10 18:26:18 +00:00
|
|
|
* askappend box), we should log it more prominently.
|
2015-09-25 08:15:21 +00:00
|
|
|
*/
|
Refactor the LogContext type.
LogContext is now the owner of the logevent() function that back ends
and so forth are constantly calling. Previously, logevent was owned by
the Frontend, which would store the message into its list for the GUI
Event Log dialog (or print it to standard error, or whatever) and then
pass it _back_ to LogContext to write to the currently open log file.
Now it's the other way round: LogContext gets the message from the
back end first, writes it to its log file if it feels so inclined, and
communicates it back to the front end.
This means that lots of parts of the back end system no longer need to
have a pointer to a full-on Frontend; the only thing they needed it
for was logging, so now they just have a LogContext (which many of
them had to have anyway, e.g. for logging SSH packets or session
traffic).
LogContext itself also doesn't get a full Frontend pointer any more:
it now talks back to the front end via a little vtable of its own
called LogPolicy, which contains the method that passes Event Log
entries through, the old askappend() function that decides whether to
truncate a pre-existing log file, and an emergency function for
printing an especially prominent message if the log file can't be
created. One minor nice effect of this is that console and GUI apps
can implement that last function subtly differently, so that Unix
console apps can write it with a plain \n instead of the \r\n
(harmless but inelegant) that the old centralised implementation
generated.
One other consequence of this is that the LogContext has to be
provided to backend_init() so that it's available to backends from the
instant of creation, rather than being provided via a separate API
call a couple of function calls later, because backends have typically
started doing things that need logging (like making network
connections) before the call to backend_provide_logctx. Fortunately,
there's no case in the whole code base where we don't already have
logctx by the time we make a backend (so I don't actually remember why
I ever delayed providing one). So that shortens the backend API by one
function, which is always nice.
While I'm tidying up, I've also moved the printf-style logeventf() and
the handy logevent_and_free() into logging.c, instead of having copies
of them scattered around other places. This has also let me remove
some stub functions from a couple of outlying applications like
Pageant. Finally, I've removed the pointless "_tag" at the end of
LogContext's official struct name.
2018-10-10 18:26:18 +00:00
|
|
|
lp_logging_error(ctx->lp, event);
|
2015-09-25 08:15:21 +00:00
|
|
|
}
|
2005-02-18 18:33:31 +00:00
|
|
|
sfree(event);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Having either succeeded or failed in opening the log file,
|
|
|
|
* we should write any queued data out.
|
|
|
|
*/
|
2005-02-18 22:03:15 +00:00
|
|
|
assert(ctx->state != L_OPENING); /* make _sure_ it won't be requeued */
|
2005-02-18 18:33:31 +00:00
|
|
|
while (bufchain_size(&ctx->queue)) {
|
2019-02-06 20:46:45 +00:00
|
|
|
ptrlen data = bufchain_prefix(&ctx->queue);
|
2019-02-06 20:48:03 +00:00
|
|
|
logwrite(ctx, data);
|
2019-02-06 20:46:45 +00:00
|
|
|
bufchain_consume(&ctx->queue, data.len);
|
2005-02-18 18:33:31 +00:00
|
|
|
}
|
2018-10-01 20:03:34 +00:00
|
|
|
logflush(ctx);
|
2005-02-18 18:33:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Open the log file. Takes care of detecting an already-existing
|
|
|
|
* file and asking the user whether they want to append, overwrite
|
|
|
|
* or cancel logging.
|
|
|
|
*/
|
2018-09-11 14:17:16 +00:00
|
|
|
void logfopen(LogContext *ctx)
|
2005-02-18 18:33:31 +00:00
|
|
|
{
|
|
|
|
struct tm tm;
|
|
|
|
int mode;
|
|
|
|
|
|
|
|
/* Prevent repeat calls */
|
2005-02-18 22:03:15 +00:00
|
|
|
if (ctx->state != L_CLOSED)
|
2005-02-18 18:33:31 +00:00
|
|
|
return;
|
|
|
|
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 18:52:21 +00:00
|
|
|
if (!ctx->logtype)
|
2005-02-18 18:33:31 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
tm = ltime();
|
|
|
|
|
|
|
|
/* substitute special codes in file name */
|
2011-10-02 11:01:57 +00:00
|
|
|
if (ctx->currlogfilename)
|
|
|
|
filename_free(ctx->currlogfilename);
|
|
|
|
ctx->currlogfilename =
|
|
|
|
xlatlognam(conf_get_filename(ctx->conf, CONF_logfilename),
|
2015-08-08 12:35:44 +00:00
|
|
|
conf_get_str(ctx->conf, CONF_host),
|
|
|
|
conf_get_int(ctx->conf, CONF_port), &tm);
|
2005-02-18 18:33:31 +00:00
|
|
|
|
2018-02-07 07:22:18 +00:00
|
|
|
if (open_for_write_would_lose_data(ctx->currlogfilename)) {
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 18:52:21 +00:00
|
|
|
int logxfovr = conf_get_int(ctx->conf, CONF_logxfovr);
|
|
|
|
if (logxfovr != LGXF_ASK) {
|
|
|
|
mode = ((logxfovr == LGXF_OVR) ? 2 : 1);
|
2005-02-18 18:33:31 +00:00
|
|
|
} else
|
Refactor the LogContext type.
LogContext is now the owner of the logevent() function that back ends
and so forth are constantly calling. Previously, logevent was owned by
the Frontend, which would store the message into its list for the GUI
Event Log dialog (or print it to standard error, or whatever) and then
pass it _back_ to LogContext to write to the currently open log file.
Now it's the other way round: LogContext gets the message from the
back end first, writes it to its log file if it feels so inclined, and
communicates it back to the front end.
This means that lots of parts of the back end system no longer need to
have a pointer to a full-on Frontend; the only thing they needed it
for was logging, so now they just have a LogContext (which many of
them had to have anyway, e.g. for logging SSH packets or session
traffic).
LogContext itself also doesn't get a full Frontend pointer any more:
it now talks back to the front end via a little vtable of its own
called LogPolicy, which contains the method that passes Event Log
entries through, the old askappend() function that decides whether to
truncate a pre-existing log file, and an emergency function for
printing an especially prominent message if the log file can't be
created. One minor nice effect of this is that console and GUI apps
can implement that last function subtly differently, so that Unix
console apps can write it with a plain \n instead of the \r\n
(harmless but inelegant) that the old centralised implementation
generated.
One other consequence of this is that the LogContext has to be
provided to backend_init() so that it's available to backends from the
instant of creation, rather than being provided via a separate API
call a couple of function calls later, because backends have typically
started doing things that need logging (like making network
connections) before the call to backend_provide_logctx. Fortunately,
there's no case in the whole code base where we don't already have
logctx by the time we make a backend (so I don't actually remember why
I ever delayed providing one). So that shortens the backend API by one
function, which is always nice.
While I'm tidying up, I've also moved the printf-style logeventf() and
the handy logevent_and_free() into logging.c, instead of having copies
of them scattered around other places. This has also let me remove
some stub functions from a couple of outlying applications like
Pageant. Finally, I've removed the pointless "_tag" at the end of
LogContext's official struct name.
2018-10-10 18:26:18 +00:00
|
|
|
mode = lp_askappend(ctx->lp, ctx->currlogfilename,
|
|
|
|
logfopen_callback, ctx);
|
2005-02-18 18:33:31 +00:00
|
|
|
} else
|
|
|
|
mode = 2; /* create == overwrite */
|
|
|
|
|
|
|
|
if (mode < 0)
|
2005-02-18 22:03:15 +00:00
|
|
|
ctx->state = L_OPENING;
|
2005-02-18 18:33:31 +00:00
|
|
|
else
|
|
|
|
logfopen_callback(ctx, mode); /* open the file */
|
|
|
|
}
|
|
|
|
|
2018-09-11 14:17:16 +00:00
|
|
|
void logfclose(LogContext *ctx)
|
2005-02-18 18:33:31 +00:00
|
|
|
{
|
|
|
|
if (ctx->lgfp) {
|
|
|
|
fclose(ctx->lgfp);
|
|
|
|
ctx->lgfp = NULL;
|
|
|
|
}
|
2005-02-18 22:03:15 +00:00
|
|
|
ctx->state = L_CLOSED;
|
2005-02-18 18:33:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Log session traffic.
|
|
|
|
*/
|
2018-09-11 14:17:16 +00:00
|
|
|
void logtraffic(LogContext *ctx, unsigned char c, int logmode)
|
2005-02-18 18:33:31 +00:00
|
|
|
{
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 18:52:21 +00:00
|
|
|
if (ctx->logtype > 0) {
|
|
|
|
if (ctx->logtype == logmode)
|
2019-02-06 20:48:03 +00:00
|
|
|
logwrite(ctx, make_ptrlen(&c, 1));
|
2005-02-18 18:33:31 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-10-13 16:23:29 +00:00
|
|
|
static void logevent_internal(LogContext *ctx, const char *event)
|
2002-09-15 13:21:32 +00:00
|
|
|
{
|
Refactor the LogContext type.
LogContext is now the owner of the logevent() function that back ends
and so forth are constantly calling. Previously, logevent was owned by
the Frontend, which would store the message into its list for the GUI
Event Log dialog (or print it to standard error, or whatever) and then
pass it _back_ to LogContext to write to the currently open log file.
Now it's the other way round: LogContext gets the message from the
back end first, writes it to its log file if it feels so inclined, and
communicates it back to the front end.
This means that lots of parts of the back end system no longer need to
have a pointer to a full-on Frontend; the only thing they needed it
for was logging, so now they just have a LogContext (which many of
them had to have anyway, e.g. for logging SSH packets or session
traffic).
LogContext itself also doesn't get a full Frontend pointer any more:
it now talks back to the front end via a little vtable of its own
called LogPolicy, which contains the method that passes Event Log
entries through, the old askappend() function that decides whether to
truncate a pre-existing log file, and an emergency function for
printing an especially prominent message if the log file can't be
created. One minor nice effect of this is that console and GUI apps
can implement that last function subtly differently, so that Unix
console apps can write it with a plain \n instead of the \r\n
(harmless but inelegant) that the old centralised implementation
generated.
One other consequence of this is that the LogContext has to be
provided to backend_init() so that it's available to backends from the
instant of creation, rather than being provided via a separate API
call a couple of function calls later, because backends have typically
started doing things that need logging (like making network
connections) before the call to backend_provide_logctx. Fortunately,
there's no case in the whole code base where we don't already have
logctx by the time we make a backend (so I don't actually remember why
I ever delayed providing one). So that shortens the backend API by one
function, which is always nice.
While I'm tidying up, I've also moved the printf-style logeventf() and
the handy logevent_and_free() into logging.c, instead of having copies
of them scattered around other places. This has also let me remove
some stub functions from a couple of outlying applications like
Pageant. Finally, I've removed the pointless "_tag" at the end of
LogContext's official struct name.
2018-10-10 18:26:18 +00:00
|
|
|
if (ctx->logtype == LGTYP_PACKETS || ctx->logtype == LGTYP_SSHRAW) {
|
|
|
|
logprintf(ctx, "Event Log: %s\r\n", event);
|
|
|
|
logflush(ctx);
|
|
|
|
}
|
|
|
|
lp_eventlog(ctx->lp, event);
|
|
|
|
}
|
|
|
|
|
2018-10-13 16:23:29 +00:00
|
|
|
void logevent(LogContext *ctx, const char *event)
|
|
|
|
{
|
|
|
|
if (!ctx)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Replace newlines in Event Log messages with spaces. (Sometimes
|
|
|
|
* the same message string is reused for the Event Log and a GUI
|
|
|
|
* dialog box; newlines are sometimes appropriate in the latter,
|
|
|
|
* but never in the former.)
|
|
|
|
*/
|
|
|
|
if (strchr(event, '\n') || strchr(event, '\r')) {
|
|
|
|
char *dup = dupstr(event);
|
|
|
|
char *p = dup, *q = dup;
|
|
|
|
while (*p) {
|
|
|
|
if (*p == '\r' || *p == '\n') {
|
|
|
|
do {
|
|
|
|
p++;
|
|
|
|
} while (*p == '\r' || *p == '\n');
|
|
|
|
*q++ = ' ';
|
|
|
|
} else {
|
|
|
|
*q++ = *p++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
*q = '\0';
|
|
|
|
logevent_internal(ctx, dup);
|
|
|
|
sfree(dup);
|
|
|
|
} else {
|
|
|
|
logevent_internal(ctx, event);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Refactor the LogContext type.
LogContext is now the owner of the logevent() function that back ends
and so forth are constantly calling. Previously, logevent was owned by
the Frontend, which would store the message into its list for the GUI
Event Log dialog (or print it to standard error, or whatever) and then
pass it _back_ to LogContext to write to the currently open log file.
Now it's the other way round: LogContext gets the message from the
back end first, writes it to its log file if it feels so inclined, and
communicates it back to the front end.
This means that lots of parts of the back end system no longer need to
have a pointer to a full-on Frontend; the only thing they needed it
for was logging, so now they just have a LogContext (which many of
them had to have anyway, e.g. for logging SSH packets or session
traffic).
LogContext itself also doesn't get a full Frontend pointer any more:
it now talks back to the front end via a little vtable of its own
called LogPolicy, which contains the method that passes Event Log
entries through, the old askappend() function that decides whether to
truncate a pre-existing log file, and an emergency function for
printing an especially prominent message if the log file can't be
created. One minor nice effect of this is that console and GUI apps
can implement that last function subtly differently, so that Unix
console apps can write it with a plain \n instead of the \r\n
(harmless but inelegant) that the old centralised implementation
generated.
One other consequence of this is that the LogContext has to be
provided to backend_init() so that it's available to backends from the
instant of creation, rather than being provided via a separate API
call a couple of function calls later, because backends have typically
started doing things that need logging (like making network
connections) before the call to backend_provide_logctx. Fortunately,
there's no case in the whole code base where we don't already have
logctx by the time we make a backend (so I don't actually remember why
I ever delayed providing one). So that shortens the backend API by one
function, which is always nice.
While I'm tidying up, I've also moved the printf-style logeventf() and
the handy logevent_and_free() into logging.c, instead of having copies
of them scattered around other places. This has also let me remove
some stub functions from a couple of outlying applications like
Pageant. Finally, I've removed the pointless "_tag" at the end of
LogContext's official struct name.
2018-10-10 18:26:18 +00:00
|
|
|
void logevent_and_free(LogContext *ctx, char *event)
|
|
|
|
{
|
|
|
|
logevent(ctx, event);
|
|
|
|
sfree(event);
|
|
|
|
}
|
|
|
|
|
2018-10-13 16:03:27 +00:00
|
|
|
void logeventvf(LogContext *ctx, const char *fmt, va_list ap)
|
|
|
|
{
|
|
|
|
logevent_and_free(ctx, dupvprintf(fmt, ap));
|
|
|
|
}
|
|
|
|
|
Refactor the LogContext type.
LogContext is now the owner of the logevent() function that back ends
and so forth are constantly calling. Previously, logevent was owned by
the Frontend, which would store the message into its list for the GUI
Event Log dialog (or print it to standard error, or whatever) and then
pass it _back_ to LogContext to write to the currently open log file.
Now it's the other way round: LogContext gets the message from the
back end first, writes it to its log file if it feels so inclined, and
communicates it back to the front end.
This means that lots of parts of the back end system no longer need to
have a pointer to a full-on Frontend; the only thing they needed it
for was logging, so now they just have a LogContext (which many of
them had to have anyway, e.g. for logging SSH packets or session
traffic).
LogContext itself also doesn't get a full Frontend pointer any more:
it now talks back to the front end via a little vtable of its own
called LogPolicy, which contains the method that passes Event Log
entries through, the old askappend() function that decides whether to
truncate a pre-existing log file, and an emergency function for
printing an especially prominent message if the log file can't be
created. One minor nice effect of this is that console and GUI apps
can implement that last function subtly differently, so that Unix
console apps can write it with a plain \n instead of the \r\n
(harmless but inelegant) that the old centralised implementation
generated.
One other consequence of this is that the LogContext has to be
provided to backend_init() so that it's available to backends from the
instant of creation, rather than being provided via a separate API
call a couple of function calls later, because backends have typically
started doing things that need logging (like making network
connections) before the call to backend_provide_logctx. Fortunately,
there's no case in the whole code base where we don't already have
logctx by the time we make a backend (so I don't actually remember why
I ever delayed providing one). So that shortens the backend API by one
function, which is always nice.
While I'm tidying up, I've also moved the printf-style logeventf() and
the handy logevent_and_free() into logging.c, instead of having copies
of them scattered around other places. This has also let me remove
some stub functions from a couple of outlying applications like
Pageant. Finally, I've removed the pointless "_tag" at the end of
LogContext's official struct name.
2018-10-10 18:26:18 +00:00
|
|
|
void logeventf(LogContext *ctx, const char *fmt, ...)
|
|
|
|
{
|
|
|
|
va_list ap;
|
|
|
|
|
|
|
|
va_start(ap, fmt);
|
2018-10-13 16:03:27 +00:00
|
|
|
logeventvf(ctx, fmt, ap);
|
Refactor the LogContext type.
LogContext is now the owner of the logevent() function that back ends
and so forth are constantly calling. Previously, logevent was owned by
the Frontend, which would store the message into its list for the GUI
Event Log dialog (or print it to standard error, or whatever) and then
pass it _back_ to LogContext to write to the currently open log file.
Now it's the other way round: LogContext gets the message from the
back end first, writes it to its log file if it feels so inclined, and
communicates it back to the front end.
This means that lots of parts of the back end system no longer need to
have a pointer to a full-on Frontend; the only thing they needed it
for was logging, so now they just have a LogContext (which many of
them had to have anyway, e.g. for logging SSH packets or session
traffic).
LogContext itself also doesn't get a full Frontend pointer any more:
it now talks back to the front end via a little vtable of its own
called LogPolicy, which contains the method that passes Event Log
entries through, the old askappend() function that decides whether to
truncate a pre-existing log file, and an emergency function for
printing an especially prominent message if the log file can't be
created. One minor nice effect of this is that console and GUI apps
can implement that last function subtly differently, so that Unix
console apps can write it with a plain \n instead of the \r\n
(harmless but inelegant) that the old centralised implementation
generated.
One other consequence of this is that the LogContext has to be
provided to backend_init() so that it's available to backends from the
instant of creation, rather than being provided via a separate API
call a couple of function calls later, because backends have typically
started doing things that need logging (like making network
connections) before the call to backend_provide_logctx. Fortunately,
there's no case in the whole code base where we don't already have
logctx by the time we make a backend (so I don't actually remember why
I ever delayed providing one). So that shortens the backend API by one
function, which is always nice.
While I'm tidying up, I've also moved the printf-style logeventf() and
the handy logevent_and_free() into logging.c, instead of having copies
of them scattered around other places. This has also let me remove
some stub functions from a couple of outlying applications like
Pageant. Finally, I've removed the pointless "_tag" at the end of
LogContext's official struct name.
2018-10-10 18:26:18 +00:00
|
|
|
va_end(ap);
|
2002-09-15 13:21:32 +00:00
|
|
|
}
|
|
|
|
|
2001-12-14 14:57:50 +00:00
|
|
|
/*
|
|
|
|
* Log an SSH packet.
|
2004-10-02 00:33:27 +00:00
|
|
|
* If n_blanks != 0, blank or omit some parts.
|
|
|
|
* Set of blanking areas must be in increasing order.
|
2001-12-14 14:57:50 +00:00
|
|
|
*/
|
2018-09-11 14:17:16 +00:00
|
|
|
void log_packet(LogContext *ctx, int direction, int type,
|
2019-02-06 20:42:44 +00:00
|
|
|
const char *texttype, const void *data, size_t len,
|
2008-11-11 07:47:27 +00:00
|
|
|
int n_blanks, const struct logblank_t *blanks,
|
2013-11-17 14:05:41 +00:00
|
|
|
const unsigned long *seq,
|
|
|
|
unsigned downstream_id, const char *additional_log_text)
|
2001-12-14 14:57:50 +00:00
|
|
|
{
|
2019-02-06 20:42:44 +00:00
|
|
|
char dumpdata[128], smalldata[5];
|
|
|
|
size_t p = 0, b = 0, omitted = 0;
|
2005-02-18 18:33:31 +00:00
|
|
|
int output_pos = 0; /* NZ if pending output in dumpdata */
|
2001-12-14 14:57:50 +00:00
|
|
|
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 18:52:21 +00:00
|
|
|
if (!(ctx->logtype == LGTYP_SSHRAW ||
|
|
|
|
(ctx->logtype == LGTYP_PACKETS && texttype)))
|
2001-12-14 14:57:50 +00:00
|
|
|
return;
|
2004-10-02 00:33:27 +00:00
|
|
|
|
2005-02-18 18:33:31 +00:00
|
|
|
/* Packet header. */
|
2008-11-11 07:47:27 +00:00
|
|
|
if (texttype) {
|
2013-11-17 14:05:41 +00:00
|
|
|
logprintf(ctx, "%s packet ",
|
|
|
|
direction == PKT_INCOMING ? "Incoming" : "Outgoing");
|
|
|
|
|
|
|
|
if (seq)
|
|
|
|
logprintf(ctx, "#0x%lx, ", *seq);
|
|
|
|
|
|
|
|
logprintf(ctx, "type %d / 0x%02x (%s)", type, type, texttype);
|
|
|
|
|
|
|
|
if (downstream_id) {
|
|
|
|
logprintf(ctx, " on behalf of downstream #%u", downstream_id);
|
|
|
|
if (additional_log_text)
|
|
|
|
logprintf(ctx, " (%s)", additional_log_text);
|
|
|
|
}
|
|
|
|
|
|
|
|
logprintf(ctx, "\r\n");
|
2008-11-11 07:47:27 +00:00
|
|
|
} else {
|
2012-10-10 18:32:23 +00:00
|
|
|
/*
|
|
|
|
* Raw data is logged with a timestamp, so that it's possible
|
|
|
|
* to determine whether a mysterious delay occurred at the
|
|
|
|
* client or server end. (Timestamping the raw data avoids
|
|
|
|
* cluttering the normal case of only logging decrypted SSH
|
|
|
|
* messages, and also adds conceptual rigour in the case where
|
|
|
|
* an SSH message arrives in several pieces.)
|
|
|
|
*/
|
|
|
|
char buf[256];
|
|
|
|
struct tm tm;
|
|
|
|
tm = ltime();
|
|
|
|
strftime(buf, 24, "%Y-%m-%d %H:%M:%S", &tm);
|
|
|
|
logprintf(ctx, "%s raw data at %s\r\n",
|
|
|
|
direction == PKT_INCOMING ? "Incoming" : "Outgoing",
|
|
|
|
buf);
|
2008-11-11 07:47:27 +00:00
|
|
|
}
|
2005-02-18 18:33:31 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Output a hex/ASCII dump of the packet body, blanking/omitting
|
|
|
|
* parts as specified.
|
|
|
|
*/
|
|
|
|
while (p < len) {
|
|
|
|
int blktype;
|
|
|
|
|
|
|
|
/* Move to a current entry in the blanking array. */
|
|
|
|
while ((b < n_blanks) &&
|
|
|
|
(p >= blanks[b].offset + blanks[b].len))
|
|
|
|
b++;
|
|
|
|
/* Work out what type of blanking to apply to
|
|
|
|
* this byte. */
|
|
|
|
blktype = PKTLOG_EMIT; /* default */
|
|
|
|
if ((b < n_blanks) &&
|
|
|
|
(p >= blanks[b].offset) &&
|
|
|
|
(p < blanks[b].offset + blanks[b].len))
|
|
|
|
blktype = blanks[b].type;
|
|
|
|
|
|
|
|
/* If we're about to stop omitting, it's time to say how
|
|
|
|
* much we omitted. */
|
|
|
|
if ((blktype != PKTLOG_OMIT) && omitted) {
|
|
|
|
logprintf(ctx, " (%d byte%s omitted)\r\n",
|
|
|
|
omitted, (omitted==1?"":"s"));
|
|
|
|
omitted = 0;
|
|
|
|
}
|
2004-10-02 00:33:27 +00:00
|
|
|
|
2005-02-18 18:33:31 +00:00
|
|
|
/* (Re-)initialise dumpdata as necessary
|
|
|
|
* (start of row, or if we've just stopped omitting) */
|
|
|
|
if (!output_pos && !omitted)
|
2019-02-06 20:42:44 +00:00
|
|
|
sprintf(dumpdata, " %08zx%*s\r\n", p-(p%16), 1+3*16+2+16, "");
|
2005-02-18 18:33:31 +00:00
|
|
|
|
|
|
|
/* Deal with the current byte. */
|
|
|
|
if (blktype == PKTLOG_OMIT) {
|
|
|
|
omitted++;
|
|
|
|
} else {
|
|
|
|
int c;
|
|
|
|
if (blktype == PKTLOG_BLANK) {
|
|
|
|
c = 'X';
|
|
|
|
sprintf(smalldata, "XX");
|
|
|
|
} else { /* PKTLOG_EMIT */
|
|
|
|
c = ((unsigned char *)data)[p];
|
|
|
|
sprintf(smalldata, "%02x", c);
|
2001-12-14 14:57:50 +00:00
|
|
|
}
|
2005-02-18 18:33:31 +00:00
|
|
|
dumpdata[10+2+3*(p%16)] = smalldata[0];
|
|
|
|
dumpdata[10+2+3*(p%16)+1] = smalldata[1];
|
2017-11-27 20:39:17 +00:00
|
|
|
dumpdata[10+1+3*16+2+(p%16)] = (c >= 0x20 && c < 0x7F ? c : '.');
|
2005-02-18 18:33:31 +00:00
|
|
|
output_pos = (p%16) + 1;
|
2001-12-14 14:57:50 +00:00
|
|
|
}
|
2004-10-02 00:33:27 +00:00
|
|
|
|
2005-02-18 18:33:31 +00:00
|
|
|
p++;
|
2001-12-14 14:57:50 +00:00
|
|
|
|
2005-02-18 18:33:31 +00:00
|
|
|
/* Flush row if necessary */
|
|
|
|
if (((p % 16) == 0) || (p == len) || omitted) {
|
|
|
|
if (output_pos) {
|
|
|
|
strcpy(dumpdata + 10+1+3*16+2+output_pos, "\r\n");
|
2019-02-06 20:48:03 +00:00
|
|
|
logwrite(ctx, ptrlen_from_asciz(dumpdata));
|
2005-02-18 18:33:31 +00:00
|
|
|
output_pos = 0;
|
|
|
|
}
|
2001-12-14 14:57:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2005-02-18 18:33:31 +00:00
|
|
|
/* Tidy up */
|
|
|
|
if (omitted)
|
|
|
|
logprintf(ctx, " (%d byte%s omitted)\r\n",
|
|
|
|
omitted, (omitted==1?"":"s"));
|
|
|
|
logflush(ctx);
|
2001-12-14 14:57:50 +00:00
|
|
|
}
|
|
|
|
|
Refactor the LogContext type.
LogContext is now the owner of the logevent() function that back ends
and so forth are constantly calling. Previously, logevent was owned by
the Frontend, which would store the message into its list for the GUI
Event Log dialog (or print it to standard error, or whatever) and then
pass it _back_ to LogContext to write to the currently open log file.
Now it's the other way round: LogContext gets the message from the
back end first, writes it to its log file if it feels so inclined, and
communicates it back to the front end.
This means that lots of parts of the back end system no longer need to
have a pointer to a full-on Frontend; the only thing they needed it
for was logging, so now they just have a LogContext (which many of
them had to have anyway, e.g. for logging SSH packets or session
traffic).
LogContext itself also doesn't get a full Frontend pointer any more:
it now talks back to the front end via a little vtable of its own
called LogPolicy, which contains the method that passes Event Log
entries through, the old askappend() function that decides whether to
truncate a pre-existing log file, and an emergency function for
printing an especially prominent message if the log file can't be
created. One minor nice effect of this is that console and GUI apps
can implement that last function subtly differently, so that Unix
console apps can write it with a plain \n instead of the \r\n
(harmless but inelegant) that the old centralised implementation
generated.
One other consequence of this is that the LogContext has to be
provided to backend_init() so that it's available to backends from the
instant of creation, rather than being provided via a separate API
call a couple of function calls later, because backends have typically
started doing things that need logging (like making network
connections) before the call to backend_provide_logctx. Fortunately,
there's no case in the whole code base where we don't already have
logctx by the time we make a backend (so I don't actually remember why
I ever delayed providing one). So that shortens the backend API by one
function, which is always nice.
While I'm tidying up, I've also moved the printf-style logeventf() and
the handy logevent_and_free() into logging.c, instead of having copies
of them scattered around other places. This has also let me remove
some stub functions from a couple of outlying applications like
Pageant. Finally, I've removed the pointless "_tag" at the end of
LogContext's official struct name.
2018-10-10 18:26:18 +00:00
|
|
|
LogContext *log_init(LogPolicy *lp, Conf *conf)
|
2002-10-26 12:58:13 +00:00
|
|
|
{
|
2018-09-11 14:17:16 +00:00
|
|
|
LogContext *ctx = snew(LogContext);
|
2002-10-26 12:58:13 +00:00
|
|
|
ctx->lgfp = NULL;
|
2005-02-18 22:03:15 +00:00
|
|
|
ctx->state = L_CLOSED;
|
Refactor the LogContext type.
LogContext is now the owner of the logevent() function that back ends
and so forth are constantly calling. Previously, logevent was owned by
the Frontend, which would store the message into its list for the GUI
Event Log dialog (or print it to standard error, or whatever) and then
pass it _back_ to LogContext to write to the currently open log file.
Now it's the other way round: LogContext gets the message from the
back end first, writes it to its log file if it feels so inclined, and
communicates it back to the front end.
This means that lots of parts of the back end system no longer need to
have a pointer to a full-on Frontend; the only thing they needed it
for was logging, so now they just have a LogContext (which many of
them had to have anyway, e.g. for logging SSH packets or session
traffic).
LogContext itself also doesn't get a full Frontend pointer any more:
it now talks back to the front end via a little vtable of its own
called LogPolicy, which contains the method that passes Event Log
entries through, the old askappend() function that decides whether to
truncate a pre-existing log file, and an emergency function for
printing an especially prominent message if the log file can't be
created. One minor nice effect of this is that console and GUI apps
can implement that last function subtly differently, so that Unix
console apps can write it with a plain \n instead of the \r\n
(harmless but inelegant) that the old centralised implementation
generated.
One other consequence of this is that the LogContext has to be
provided to backend_init() so that it's available to backends from the
instant of creation, rather than being provided via a separate API
call a couple of function calls later, because backends have typically
started doing things that need logging (like making network
connections) before the call to backend_provide_logctx. Fortunately,
there's no case in the whole code base where we don't already have
logctx by the time we make a backend (so I don't actually remember why
I ever delayed providing one). So that shortens the backend API by one
function, which is always nice.
While I'm tidying up, I've also moved the printf-style logeventf() and
the handy logevent_and_free() into logging.c, instead of having copies
of them scattered around other places. This has also let me remove
some stub functions from a couple of outlying applications like
Pageant. Finally, I've removed the pointless "_tag" at the end of
LogContext's official struct name.
2018-10-10 18:26:18 +00:00
|
|
|
ctx->lp = lp;
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 18:52:21 +00:00
|
|
|
ctx->conf = conf_copy(conf);
|
|
|
|
ctx->logtype = conf_get_int(ctx->conf, CONF_logtype);
|
2011-10-02 11:01:57 +00:00
|
|
|
ctx->currlogfilename = NULL;
|
2005-02-18 18:33:31 +00:00
|
|
|
bufchain_init(&ctx->queue);
|
2002-10-26 12:58:13 +00:00
|
|
|
return ctx;
|
|
|
|
}
|
|
|
|
|
2018-09-11 14:17:16 +00:00
|
|
|
void log_free(LogContext *ctx)
|
2003-01-15 23:30:21 +00:00
|
|
|
{
|
|
|
|
logfclose(ctx);
|
2005-02-18 18:33:31 +00:00
|
|
|
bufchain_clear(&ctx->queue);
|
2011-10-02 11:01:57 +00:00
|
|
|
if (ctx->currlogfilename)
|
|
|
|
filename_free(ctx->currlogfilename);
|
2014-11-09 00:54:35 +00:00
|
|
|
conf_free(ctx->conf);
|
2003-01-15 23:30:21 +00:00
|
|
|
sfree(ctx);
|
|
|
|
}
|
|
|
|
|
2018-09-11 14:17:16 +00:00
|
|
|
void log_reconfig(LogContext *ctx, Conf *conf)
|
2003-01-12 15:10:27 +00:00
|
|
|
{
|
Convert a lot of 'int' variables to 'bool'.
My normal habit these days, in new code, is to treat int and bool as
_almost_ completely separate types. I'm still willing to use C's
implicit test for zero on an integer (e.g. 'if (!blob.len)' is fine,
no need to spell it out as blob.len != 0), but generally, if a
variable is going to be conceptually a boolean, I like to declare it
bool and assign to it using 'true' or 'false' rather than 0 or 1.
PuTTY is an exception, because it predates the C99 bool, and I've
stuck to its existing coding style even when adding new code to it.
But it's been annoying me more and more, so now that I've decided C99
bool is an acceptable thing to require from our toolchain in the first
place, here's a quite thorough trawl through the source doing
'boolification'. Many variables and function parameters are now typed
as bool rather than int; many assignments of 0 or 1 to those variables
are now spelled 'true' or 'false'.
I managed this thorough conversion with the help of a custom clang
plugin that I wrote to trawl the AST and apply heuristics to point out
where things might want changing. So I've even managed to do a decent
job on parts of the code I haven't looked at in years!
To make the plugin's work easier, I pushed platform front ends
generally in the direction of using standard 'bool' in preference to
platform-specific boolean types like Windows BOOL or GTK's gboolean;
I've left the platform booleans in places they _have_ to be for the
platform APIs to work right, but variables only used by my own code
have been converted wherever I found them.
In a few places there are int values that look very like booleans in
_most_ of the places they're used, but have a rarely-used third value,
or a distinction between different nonzero values that most users
don't care about. In these cases, I've _removed_ uses of 'true' and
'false' for the return values, to emphasise that there's something
more subtle going on than a simple boolean answer:
- the 'multisel' field in dialog.h's list box structure, for which
the GTK front end in particular recognises a difference between 1
and 2 but nearly everything else treats as boolean
- the 'urgent' parameter to plug_receive, where 1 vs 2 tells you
something about the specific location of the urgent pointer, but
most clients only care about 0 vs 'something nonzero'
- the return value of wc_match, where -1 indicates a syntax error in
the wildcard.
- the return values from SSH-1 RSA-key loading functions, which use
-1 for 'wrong passphrase' and 0 for all other failures (so any
caller which already knows it's not loading an _encrypted private_
key can treat them as boolean)
- term->esc_query, and the 'query' parameter in toggle_mode in
terminal.c, which _usually_ hold 0 for ESC[123h or 1 for ESC[?123h,
but can also hold -1 for some other intervening character that we
don't support.
In a few places there's an integer that I haven't turned into a bool
even though it really _can_ only take values 0 or 1 (and, as above,
tried to make the call sites consistent in not calling those values
true and false), on the grounds that I thought it would make it more
confusing to imply that the 0 value was in some sense 'negative' or
bad and the 1 positive or good:
- the return value of plug_accepting uses the POSIXish convention of
0=success and nonzero=error; I think if I made it bool then I'd
also want to reverse its sense, and that's a job for a separate
piece of work.
- the 'screen' parameter to lineptr() in terminal.c, where 0 and 1
represent the default and alternate screens. There's no obvious
reason why one of those should be considered 'true' or 'positive'
or 'success' - they're just indices - so I've left it as int.
ssh_scp_recv had particularly confusing semantics for its previous int
return value: its call sites used '<= 0' to check for error, but it
never actually returned a negative number, just 0 or 1. Now the
function and its call sites agree that it's a bool.
In a couple of places I've renamed variables called 'ret', because I
don't like that name any more - it's unclear whether it means the
return value (in preparation) for the _containing_ function or the
return value received from a subroutine call, and occasionally I've
accidentally used the same variable for both and introduced a bug. So
where one of those got in my way, I've renamed it to 'toret' or 'retd'
(the latter short for 'returned') in line with my usual modern
practice, but I haven't done a thorough job of finding all of them.
Finally, one amusing side effect of doing this is that I've had to
separate quite a few chained assignments. It used to be perfectly fine
to write 'a = b = c = TRUE' when a,b,c were int and TRUE was just a
the 'true' defined by stdbool.h, that idiom provokes a warning from
gcc: 'suggest parentheses around assignment used as truth value'!
2018-11-02 19:23:19 +00:00
|
|
|
bool reset_logging;
|
2003-01-12 15:10:27 +00:00
|
|
|
|
2011-10-02 11:01:57 +00:00
|
|
|
if (!filename_equal(conf_get_filename(ctx->conf, CONF_logfilename),
|
|
|
|
conf_get_filename(conf, CONF_logfilename)) ||
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 18:52:21 +00:00
|
|
|
conf_get_int(ctx->conf, CONF_logtype) !=
|
|
|
|
conf_get_int(conf, CONF_logtype))
|
2018-10-29 19:50:29 +00:00
|
|
|
reset_logging = true;
|
2003-01-12 15:10:27 +00:00
|
|
|
else
|
2018-10-29 19:50:29 +00:00
|
|
|
reset_logging = false;
|
2003-01-12 15:10:27 +00:00
|
|
|
|
|
|
|
if (reset_logging)
|
2003-01-12 15:42:24 +00:00
|
|
|
logfclose(ctx);
|
2003-01-12 15:10:27 +00:00
|
|
|
|
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an
arbitrary length limit on every single one of those settings which is
stored in string form. In place of it is 'Conf', an opaque data type
everywhere outside the new file conf.c, which stores a list of (key,
value) pairs in which every key contains an integer identifying a
configuration setting, and for some of those integers the key also
contains extra parts (so that, for instance, CONF_environmt is a
string-to-string mapping). Everywhere that a Config was previously
used, a Conf is now; everywhere there was a Config structure copy,
conf_copy() is called; every lookup, adjustment, load and save
operation on a Config has been rewritten; and there's a mechanism for
serialising a Conf into a binary blob and back for use with Duplicate
Session.
User-visible effects of this change _should_ be minimal, though I
don't doubt I've introduced one or two bugs here and there which will
eventually be found. The _intended_ visible effects of this change are
that all arbitrary limits on configuration strings and lists (e.g.
limit on number of port forwardings) should now disappear; that list
boxes in the configuration will now be displayed in a sorted order
rather than the arbitrary order in which they were added to the list
(since the underlying data structure is now a sorted tree234 rather
than an ad-hoc comma-separated string); and one more specific change,
which is that local and dynamic port forwardings on the same port
number are now mutually exclusive in the configuration (putting 'D' in
the key rather than the value was a mistake in the first place).
One other reorganisation as a result of this is that I've moved all
the dialog.c standard handlers (dlg_stdeditbox_handler and friends)
out into config.c, because I can't really justify calling them generic
any more. When they took a pointer to an arbitrary structure type and
the offset of a field within that structure, they were independent of
whether that structure was a Config or something completely different,
but now they really do expect to talk to a Conf, which can _only_ be
used for PuTTY configuration, so I've renamed them all things like
conf_editbox_handler and moved them out of the nominally independent
dialog-box management module into the PuTTY-specific config.c.
[originally from svn r9214]
2011-07-14 18:52:21 +00:00
|
|
|
conf_free(ctx->conf);
|
|
|
|
ctx->conf = conf_copy(conf);
|
|
|
|
|
|
|
|
ctx->logtype = conf_get_int(ctx->conf, CONF_logtype);
|
2003-01-12 15:10:27 +00:00
|
|
|
|
|
|
|
if (reset_logging)
|
2003-01-12 15:42:24 +00:00
|
|
|
logfopen(ctx);
|
2003-01-12 15:10:27 +00:00
|
|
|
}
|
|
|
|
|
2001-12-14 14:57:50 +00:00
|
|
|
/*
|
|
|
|
* translate format codes into time/date strings
|
|
|
|
* and insert them into log file name
|
|
|
|
*
|
2006-10-31 16:59:56 +00:00
|
|
|
* "&Y":YYYY "&m":MM "&d":DD "&T":hhmmss "&h":<hostname> "&&":&
|
2001-12-14 14:57:50 +00:00
|
|
|
*/
|
2015-08-08 12:35:44 +00:00
|
|
|
static Filename *xlatlognam(Filename *src, char *hostname, int port,
|
|
|
|
struct tm *tm)
|
2011-10-02 11:01:57 +00:00
|
|
|
{
|
2015-08-08 12:35:44 +00:00
|
|
|
char buf[32], *bufp;
|
2001-12-14 14:57:50 +00:00
|
|
|
int size;
|
2011-10-02 11:01:57 +00:00
|
|
|
char *buffer;
|
|
|
|
int buflen, bufsize;
|
2003-02-01 17:24:27 +00:00
|
|
|
const char *s;
|
2011-10-02 11:01:57 +00:00
|
|
|
Filename *ret;
|
2003-02-01 12:54:40 +00:00
|
|
|
|
2011-10-02 11:01:57 +00:00
|
|
|
bufsize = FILENAME_MAX;
|
|
|
|
buffer = snewn(bufsize, char);
|
|
|
|
buflen = 0;
|
|
|
|
s = filename_to_str(src);
|
2001-12-14 14:57:50 +00:00
|
|
|
|
|
|
|
while (*s) {
|
Convert a lot of 'int' variables to 'bool'.
My normal habit these days, in new code, is to treat int and bool as
_almost_ completely separate types. I'm still willing to use C's
implicit test for zero on an integer (e.g. 'if (!blob.len)' is fine,
no need to spell it out as blob.len != 0), but generally, if a
variable is going to be conceptually a boolean, I like to declare it
bool and assign to it using 'true' or 'false' rather than 0 or 1.
PuTTY is an exception, because it predates the C99 bool, and I've
stuck to its existing coding style even when adding new code to it.
But it's been annoying me more and more, so now that I've decided C99
bool is an acceptable thing to require from our toolchain in the first
place, here's a quite thorough trawl through the source doing
'boolification'. Many variables and function parameters are now typed
as bool rather than int; many assignments of 0 or 1 to those variables
are now spelled 'true' or 'false'.
I managed this thorough conversion with the help of a custom clang
plugin that I wrote to trawl the AST and apply heuristics to point out
where things might want changing. So I've even managed to do a decent
job on parts of the code I haven't looked at in years!
To make the plugin's work easier, I pushed platform front ends
generally in the direction of using standard 'bool' in preference to
platform-specific boolean types like Windows BOOL or GTK's gboolean;
I've left the platform booleans in places they _have_ to be for the
platform APIs to work right, but variables only used by my own code
have been converted wherever I found them.
In a few places there are int values that look very like booleans in
_most_ of the places they're used, but have a rarely-used third value,
or a distinction between different nonzero values that most users
don't care about. In these cases, I've _removed_ uses of 'true' and
'false' for the return values, to emphasise that there's something
more subtle going on than a simple boolean answer:
- the 'multisel' field in dialog.h's list box structure, for which
the GTK front end in particular recognises a difference between 1
and 2 but nearly everything else treats as boolean
- the 'urgent' parameter to plug_receive, where 1 vs 2 tells you
something about the specific location of the urgent pointer, but
most clients only care about 0 vs 'something nonzero'
- the return value of wc_match, where -1 indicates a syntax error in
the wildcard.
- the return values from SSH-1 RSA-key loading functions, which use
-1 for 'wrong passphrase' and 0 for all other failures (so any
caller which already knows it's not loading an _encrypted private_
key can treat them as boolean)
- term->esc_query, and the 'query' parameter in toggle_mode in
terminal.c, which _usually_ hold 0 for ESC[123h or 1 for ESC[?123h,
but can also hold -1 for some other intervening character that we
don't support.
In a few places there's an integer that I haven't turned into a bool
even though it really _can_ only take values 0 or 1 (and, as above,
tried to make the call sites consistent in not calling those values
true and false), on the grounds that I thought it would make it more
confusing to imply that the 0 value was in some sense 'negative' or
bad and the 1 positive or good:
- the return value of plug_accepting uses the POSIXish convention of
0=success and nonzero=error; I think if I made it bool then I'd
also want to reverse its sense, and that's a job for a separate
piece of work.
- the 'screen' parameter to lineptr() in terminal.c, where 0 and 1
represent the default and alternate screens. There's no obvious
reason why one of those should be considered 'true' or 'positive'
or 'success' - they're just indices - so I've left it as int.
ssh_scp_recv had particularly confusing semantics for its previous int
return value: its call sites used '<= 0' to check for error, but it
never actually returned a negative number, just 0 or 1. Now the
function and its call sites agree that it's a bool.
In a couple of places I've renamed variables called 'ret', because I
don't like that name any more - it's unclear whether it means the
return value (in preparation) for the _containing_ function or the
return value received from a subroutine call, and occasionally I've
accidentally used the same variable for both and introduced a bug. So
where one of those got in my way, I've renamed it to 'toret' or 'retd'
(the latter short for 'returned') in line with my usual modern
practice, but I haven't done a thorough job of finding all of them.
Finally, one amusing side effect of doing this is that I've had to
separate quite a few chained assignments. It used to be perfectly fine
to write 'a = b = c = TRUE' when a,b,c were int and TRUE was just a
the 'true' defined by stdbool.h, that idiom provokes a warning from
gcc: 'suggest parentheses around assignment used as truth value'!
2018-11-02 19:23:19 +00:00
|
|
|
bool sanitise = false;
|
2001-12-14 14:57:50 +00:00
|
|
|
/* Let (bufp, len) be the string to append. */
|
|
|
|
bufp = buf; /* don't usually override this */
|
|
|
|
if (*s == '&') {
|
|
|
|
char c;
|
|
|
|
s++;
|
2002-10-09 18:09:42 +00:00
|
|
|
size = 0;
|
2009-01-11 14:26:27 +00:00
|
|
|
if (*s) switch (c = *s++, tolower((unsigned char)c)) {
|
2001-12-14 14:57:50 +00:00
|
|
|
case 'y':
|
|
|
|
size = strftime(buf, sizeof(buf), "%Y", tm);
|
|
|
|
break;
|
|
|
|
case 'm':
|
|
|
|
size = strftime(buf, sizeof(buf), "%m", tm);
|
|
|
|
break;
|
|
|
|
case 'd':
|
|
|
|
size = strftime(buf, sizeof(buf), "%d", tm);
|
|
|
|
break;
|
|
|
|
case 't':
|
|
|
|
size = strftime(buf, sizeof(buf), "%H%M%S", tm);
|
|
|
|
break;
|
|
|
|
case 'h':
|
|
|
|
bufp = hostname;
|
|
|
|
size = strlen(bufp);
|
|
|
|
break;
|
2015-08-08 12:35:44 +00:00
|
|
|
case 'p':
|
|
|
|
size = sprintf(buf, "%d", port);
|
|
|
|
break;
|
2001-12-14 14:57:50 +00:00
|
|
|
default:
|
|
|
|
buf[0] = '&';
|
|
|
|
size = 1;
|
|
|
|
if (c != '&')
|
|
|
|
buf[size++] = c;
|
|
|
|
}
|
2015-09-25 08:23:26 +00:00
|
|
|
/* Never allow path separators - or any other illegal
|
|
|
|
* filename character - to come out of any of these
|
|
|
|
* auto-format directives. E.g. 'hostname' can contain
|
|
|
|
* colons, if it's an IPv6 address, and colons aren't
|
|
|
|
* legal in filenames on Windows. */
|
2018-10-29 19:50:29 +00:00
|
|
|
sanitise = true;
|
2001-12-14 14:57:50 +00:00
|
|
|
} else {
|
|
|
|
buf[0] = *s++;
|
|
|
|
size = 1;
|
|
|
|
}
|
2011-10-02 11:01:57 +00:00
|
|
|
if (bufsize <= buflen + size) {
|
|
|
|
bufsize = (buflen + size) * 5 / 4 + 512;
|
|
|
|
buffer = sresize(buffer, bufsize, char);
|
|
|
|
}
|
2015-09-25 08:23:26 +00:00
|
|
|
while (size-- > 0) {
|
|
|
|
char c = *bufp++;
|
|
|
|
if (sanitise)
|
|
|
|
c = filename_char_sanitise(c);
|
|
|
|
buffer[buflen++] = c;
|
|
|
|
}
|
2001-12-14 14:57:50 +00:00
|
|
|
}
|
2011-10-02 11:01:57 +00:00
|
|
|
buffer[buflen] = '\0';
|
2003-02-01 12:54:40 +00:00
|
|
|
|
2011-10-02 11:01:57 +00:00
|
|
|
ret = filename_from_str(buffer);
|
|
|
|
sfree(buffer);
|
|
|
|
return ret;
|
2001-12-14 14:57:50 +00:00
|
|
|
}
|