2000-09-27 15:21:04 +00:00
|
|
|
/*
|
2022-01-22 15:38:53 +00:00
|
|
|
* storage.c: Windows-specific implementation of the interface
|
2000-09-27 15:21:04 +00:00
|
|
|
* defined in storage.h.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <stdio.h>
|
2000-10-24 10:47:49 +00:00
|
|
|
#include <stdlib.h>
|
2003-02-01 12:54:40 +00:00
|
|
|
#include <limits.h>
|
2014-09-07 13:06:50 +00:00
|
|
|
#include <assert.h>
|
2000-09-27 15:21:04 +00:00
|
|
|
#include "putty.h"
|
|
|
|
#include "storage.h"
|
|
|
|
|
2007-01-09 18:05:17 +00:00
|
|
|
#include <shlobj.h>
|
|
|
|
#ifndef CSIDL_APPDATA
|
|
|
|
#define CSIDL_APPDATA 0x001a
|
|
|
|
#endif
|
|
|
|
#ifndef CSIDL_LOCAL_APPDATA
|
|
|
|
#define CSIDL_LOCAL_APPDATA 0x001c
|
|
|
|
#endif
|
2000-09-27 16:21:52 +00:00
|
|
|
|
2010-12-23 17:32:28 +00:00
|
|
|
static const char *const reg_jumplist_key = PUTTY_REG_POS "\\Jumplist";
|
|
|
|
static const char *const reg_jumplist_value = "Recent sessions";
|
2007-01-09 18:05:17 +00:00
|
|
|
static const char *const puttystr = PUTTY_REG_POS "\\Sessions";
|
Initial support for host certificates.
Now we offer the OpenSSH certificate key types in our KEXINIT host key
algorithm list, so that if the server has a certificate, they can send
it to us.
There's a new storage.h abstraction for representing a list of trusted
host CAs, and which ones are trusted to certify hosts for what
domains. This is stored outside the normal saved session data, because
the whole point of host certificates is to avoid per-host faffing.
Configuring this set of trusted CAs is done via a new GUI dialog box,
separate from the main PuTTY config box (because it modifies a single
set of settings across all saved sessions), which you can launch by
clicking a button in the 'Host keys' pane. The GUI is pretty crude for
the moment, and very much at a 'just about usable' stage right now. It
will want some polishing.
If we have no CA configured that matches the hostname, we don't offer
to receive certified host keys in the first place. So for existing
users who haven't set any of this up yet, nothing will immediately
change.
Currently, if we do offer to receive certified host keys and the
server presents one signed by a CA we don't trust, PuTTY will bomb out
unconditionally with an error, instead of offering a confirmation box.
That's an unfinished part which I plan to fix before this goes into a
release.
2022-04-22 11:07:24 +00:00
|
|
|
static const char *const host_ca_key = PUTTY_REG_POS "\\SshHostCAs";
|
2000-09-27 15:21:04 +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
|
|
|
static bool tried_shgetfolderpath = false;
|
2007-01-09 18:05:17 +00:00
|
|
|
static HMODULE shell32_module = NULL;
|
2019-09-08 19:29:00 +00:00
|
|
|
DECL_WINDOWS_FUNCTION(static, HRESULT, SHGetFolderPathA,
|
|
|
|
(HWND, int, HANDLE, DWORD, LPSTR));
|
2007-01-09 18:05:17 +00:00
|
|
|
|
2018-09-14 07:45:42 +00:00
|
|
|
struct settings_w {
|
|
|
|
HKEY sesskey;
|
|
|
|
};
|
|
|
|
|
|
|
|
settings_w *open_settings_w(const char *sessionname, char **errmsg)
|
2001-05-06 14:35:20 +00:00
|
|
|
{
|
2003-04-01 18:10:25 +00:00
|
|
|
*errmsg = NULL;
|
|
|
|
|
2003-03-22 09:49:20 +00:00
|
|
|
if (!sessionname || !*sessionname)
|
2019-09-08 19:29:00 +00:00
|
|
|
sessionname = "Default Settings";
|
2003-03-22 09:49:20 +00:00
|
|
|
|
2022-04-22 09:01:01 +00:00
|
|
|
strbuf *sb = strbuf_new();
|
Rework mungestr() and unmungestr().
For a start, they now have different names on Windows and Unix,
reflecting their different roles: on Windows they apply escaping to
any string that's going to be used as a registry key (be it a session
name, or a host name for host key storage), whereas on Unix they're
for constructing saved-session file names in particular (and also
handle the special case of filling in "Default Settings" for NULL).
Also, they now produce output by writing to a strbuf, which simplifies
a lot of the call sites. In particular, the strbuf output idiom is
passed on to enum_settings_next, which is especially nice because its
only actual caller was doing an ad-hoc realloc loop that I can now get
rid of completely.
Thirdly, on Windows they're centralised into winmisc.c instead of
living in winstore.c, because that way Pageant can use the unescape
function too. (It was spotting the duplication there that made me
think of doing this in the first place, but once I'd started, I had to
keep unravelling the thread...)
2018-11-03 08:58:41 +00:00
|
|
|
escape_registry_key(sessionname, sb);
|
2001-05-06 14:35:20 +00:00
|
|
|
|
2022-04-22 09:01:01 +00:00
|
|
|
HKEY sesskey = open_regkey(true, HKEY_CURRENT_USER, puttystr, sb->s);
|
|
|
|
if (!sesskey) {
|
2003-04-01 18:10:25 +00:00
|
|
|
*errmsg = dupprintf("Unable to create registry key\n"
|
Rework mungestr() and unmungestr().
For a start, they now have different names on Windows and Unix,
reflecting their different roles: on Windows they apply escaping to
any string that's going to be used as a registry key (be it a session
name, or a host name for host key storage), whereas on Unix they're
for constructing saved-session file names in particular (and also
handle the special case of filling in "Default Settings" for NULL).
Also, they now produce output by writing to a strbuf, which simplifies
a lot of the call sites. In particular, the strbuf output idiom is
passed on to enum_settings_next, which is especially nice because its
only actual caller was doing an ad-hoc realloc loop that I can now get
rid of completely.
Thirdly, on Windows they're centralised into winmisc.c instead of
living in winstore.c, because that way Pageant can use the unescape
function too. (It was spotting the duplication there that made me
think of doing this in the first place, but once I'd started, I had to
keep unravelling the thread...)
2018-11-03 08:58:41 +00:00
|
|
|
"HKEY_CURRENT_USER\\%s\\%s", puttystr, sb->s);
|
2019-09-08 19:29:00 +00:00
|
|
|
strbuf_free(sb);
|
|
|
|
return NULL;
|
2003-04-01 18:10:25 +00:00
|
|
|
}
|
Rework mungestr() and unmungestr().
For a start, they now have different names on Windows and Unix,
reflecting their different roles: on Windows they apply escaping to
any string that's going to be used as a registry key (be it a session
name, or a host name for host key storage), whereas on Unix they're
for constructing saved-session file names in particular (and also
handle the special case of filling in "Default Settings" for NULL).
Also, they now produce output by writing to a strbuf, which simplifies
a lot of the call sites. In particular, the strbuf output idiom is
passed on to enum_settings_next, which is especially nice because its
only actual caller was doing an ad-hoc realloc loop that I can now get
rid of completely.
Thirdly, on Windows they're centralised into winmisc.c instead of
living in winstore.c, because that way Pageant can use the unescape
function too. (It was spotting the duplication there that made me
think of doing this in the first place, but once I'd started, I had to
keep unravelling the thread...)
2018-11-03 08:58:41 +00:00
|
|
|
strbuf_free(sb);
|
2018-09-14 07:45:42 +00:00
|
|
|
|
|
|
|
settings_w *toret = snew(settings_w);
|
|
|
|
toret->sesskey = sesskey;
|
|
|
|
return toret;
|
2000-09-27 16:21:52 +00:00
|
|
|
}
|
|
|
|
|
2018-09-14 07:45:42 +00:00
|
|
|
void write_setting_s(settings_w *handle, const char *key, const char *value)
|
2001-05-06 14:35:20 +00:00
|
|
|
{
|
2000-09-27 16:21:52 +00:00
|
|
|
if (handle)
|
2022-04-22 09:01:01 +00:00
|
|
|
put_reg_sz(handle->sesskey, key, value);
|
2000-09-27 16:21:52 +00:00
|
|
|
}
|
|
|
|
|
2018-09-14 07:45:42 +00:00
|
|
|
void write_setting_i(settings_w *handle, const char *key, int value)
|
2001-05-06 14:35:20 +00:00
|
|
|
{
|
2000-09-27 16:21:52 +00:00
|
|
|
if (handle)
|
2022-04-22 09:01:01 +00:00
|
|
|
put_reg_dword(handle->sesskey, key, value);
|
2000-09-27 16:21:52 +00:00
|
|
|
}
|
|
|
|
|
2018-09-14 07:45:42 +00:00
|
|
|
void close_settings_w(settings_w *handle)
|
2001-05-06 14:35:20 +00:00
|
|
|
{
|
2022-04-22 09:01:01 +00:00
|
|
|
close_regkey(handle->sesskey);
|
2018-09-14 07:45:42 +00:00
|
|
|
sfree(handle);
|
2000-09-27 16:21:52 +00:00
|
|
|
}
|
|
|
|
|
2018-09-14 07:45:42 +00:00
|
|
|
struct settings_r {
|
|
|
|
HKEY sesskey;
|
|
|
|
};
|
|
|
|
|
|
|
|
settings_r *open_settings_r(const char *sessionname)
|
2001-05-06 14:35:20 +00:00
|
|
|
{
|
2003-03-22 09:49:20 +00:00
|
|
|
if (!sessionname || !*sessionname)
|
2019-09-08 19:29:00 +00:00
|
|
|
sessionname = "Default Settings";
|
2003-03-22 09:49:20 +00:00
|
|
|
|
2022-04-22 09:01:01 +00:00
|
|
|
strbuf *sb = strbuf_new();
|
Rework mungestr() and unmungestr().
For a start, they now have different names on Windows and Unix,
reflecting their different roles: on Windows they apply escaping to
any string that's going to be used as a registry key (be it a session
name, or a host name for host key storage), whereas on Unix they're
for constructing saved-session file names in particular (and also
handle the special case of filling in "Default Settings" for NULL).
Also, they now produce output by writing to a strbuf, which simplifies
a lot of the call sites. In particular, the strbuf output idiom is
passed on to enum_settings_next, which is especially nice because its
only actual caller was doing an ad-hoc realloc loop that I can now get
rid of completely.
Thirdly, on Windows they're centralised into winmisc.c instead of
living in winstore.c, because that way Pageant can use the unescape
function too. (It was spotting the duplication there that made me
think of doing this in the first place, but once I'd started, I had to
keep unravelling the thread...)
2018-11-03 08:58:41 +00:00
|
|
|
escape_registry_key(sessionname, sb);
|
2022-04-22 09:01:01 +00:00
|
|
|
HKEY sesskey = open_regkey(false, HKEY_CURRENT_USER, puttystr, sb->s);
|
Rework mungestr() and unmungestr().
For a start, they now have different names on Windows and Unix,
reflecting their different roles: on Windows they apply escaping to
any string that's going to be used as a registry key (be it a session
name, or a host name for host key storage), whereas on Unix they're
for constructing saved-session file names in particular (and also
handle the special case of filling in "Default Settings" for NULL).
Also, they now produce output by writing to a strbuf, which simplifies
a lot of the call sites. In particular, the strbuf output idiom is
passed on to enum_settings_next, which is especially nice because its
only actual caller was doing an ad-hoc realloc loop that I can now get
rid of completely.
Thirdly, on Windows they're centralised into winmisc.c instead of
living in winstore.c, because that way Pageant can use the unescape
function too. (It was spotting the duplication there that made me
think of doing this in the first place, but once I'd started, I had to
keep unravelling the thread...)
2018-11-03 08:58:41 +00:00
|
|
|
strbuf_free(sb);
|
2000-09-27 16:21:52 +00:00
|
|
|
|
2019-02-27 20:29:13 +00:00
|
|
|
if (!sesskey)
|
|
|
|
return NULL;
|
|
|
|
|
2018-09-14 07:45:42 +00:00
|
|
|
settings_r *toret = snew(settings_r);
|
|
|
|
toret->sesskey = sesskey;
|
|
|
|
return toret;
|
2000-09-27 16:21:52 +00:00
|
|
|
}
|
|
|
|
|
2018-09-14 07:45:42 +00:00
|
|
|
char *read_setting_s(settings_r *handle, const char *key)
|
2001-05-06 14:35:20 +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 (!handle)
|
2019-09-08 19:29:00 +00:00
|
|
|
return NULL;
|
2022-04-22 09:01:01 +00:00
|
|
|
return get_reg_sz(handle->sesskey, key);
|
2000-09-27 16:21:52 +00:00
|
|
|
}
|
2000-09-27 15:21:04 +00:00
|
|
|
|
2018-09-14 07:45:42 +00:00
|
|
|
int read_setting_i(settings_r *handle, const char *key, int defvalue)
|
2001-05-06 14:35:20 +00:00
|
|
|
{
|
2022-04-22 09:01:01 +00:00
|
|
|
DWORD val;
|
|
|
|
if (!handle || !get_reg_dword(handle->sesskey, key, &val))
|
2019-09-08 19:29:00 +00:00
|
|
|
return defvalue;
|
2000-09-27 16:21:52 +00:00
|
|
|
else
|
2019-09-08 19:29:00 +00:00
|
|
|
return val;
|
2000-09-27 16:21:52 +00:00
|
|
|
}
|
|
|
|
|
2018-09-14 07:45:42 +00:00
|
|
|
FontSpec *read_setting_fontspec(settings_r *handle, const char *name)
|
2003-02-01 12:54:40 +00:00
|
|
|
{
|
|
|
|
char *settingname;
|
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
|
|
|
char *fontname;
|
2013-07-22 07:11:54 +00:00
|
|
|
FontSpec *ret;
|
2011-10-01 17:38:59 +00:00
|
|
|
int isbold, height, charset;
|
2003-02-01 12:54:40 +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
|
|
|
fontname = read_setting_s(handle, name);
|
|
|
|
if (!fontname)
|
2019-09-08 19:29:00 +00:00
|
|
|
return NULL;
|
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
|
|
|
|
Make dupcat() into a variadic macro.
Up until now, it's been a variadic _function_, whose argument list
consists of 'const char *' ASCIZ strings to concatenate, terminated by
one containing a null pointer. Now, that function is dupcat_fn(), and
it's wrapped by a C99 variadic _macro_ called dupcat(), which
automatically suffixes the null-pointer terminating argument.
This has three benefits. Firstly, it's just less effort at every call
site. Secondly, it protects against the risk of accidentally leaving
off the NULL, causing arbitrary words of stack memory to be
dereferenced as char pointers. And thirdly, it protects against the
more subtle risk of writing a bare 'NULL' as the terminating argument,
instead of casting it explicitly to a pointer. That last one is
necessary because C permits the macro NULL to expand to an integer
constant such as 0, so NULL by itself may not have pointer type, and
worse, it may not be marshalled in a variadic argument list in the
same way as a pointer. (For example, on a 64-bit machine it might only
occupy 32 bits. And yet, on another 64-bit platform, it might work
just fine, so that you don't notice the mistake!)
I was inspired to do this by happening to notice one of those bare
NULL terminators, and thinking I'd better check if there were any
more. Turned out there were quite a few. Now there are none.
2019-10-14 18:42:37 +00:00
|
|
|
settingname = dupcat(name, "IsBold");
|
2011-10-01 17:38:59 +00:00
|
|
|
isbold = read_setting_i(handle, settingname, -1);
|
2003-02-01 12:54:40 +00:00
|
|
|
sfree(settingname);
|
2013-07-22 07:11:54 +00:00
|
|
|
if (isbold == -1) {
|
|
|
|
sfree(fontname);
|
|
|
|
return NULL;
|
|
|
|
}
|
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
|
|
|
|
Make dupcat() into a variadic macro.
Up until now, it's been a variadic _function_, whose argument list
consists of 'const char *' ASCIZ strings to concatenate, terminated by
one containing a null pointer. Now, that function is dupcat_fn(), and
it's wrapped by a C99 variadic _macro_ called dupcat(), which
automatically suffixes the null-pointer terminating argument.
This has three benefits. Firstly, it's just less effort at every call
site. Secondly, it protects against the risk of accidentally leaving
off the NULL, causing arbitrary words of stack memory to be
dereferenced as char pointers. And thirdly, it protects against the
more subtle risk of writing a bare 'NULL' as the terminating argument,
instead of casting it explicitly to a pointer. That last one is
necessary because C permits the macro NULL to expand to an integer
constant such as 0, so NULL by itself may not have pointer type, and
worse, it may not be marshalled in a variadic argument list in the
same way as a pointer. (For example, on a 64-bit machine it might only
occupy 32 bits. And yet, on another 64-bit platform, it might work
just fine, so that you don't notice the mistake!)
I was inspired to do this by happening to notice one of those bare
NULL terminators, and thinking I'd better check if there were any
more. Turned out there were quite a few. Now there are none.
2019-10-14 18:42:37 +00:00
|
|
|
settingname = dupcat(name, "CharSet");
|
2011-10-01 17:38:59 +00:00
|
|
|
charset = read_setting_i(handle, settingname, -1);
|
2003-02-01 12:54:40 +00:00
|
|
|
sfree(settingname);
|
2013-07-22 07:11:54 +00:00
|
|
|
if (charset == -1) {
|
|
|
|
sfree(fontname);
|
|
|
|
return NULL;
|
|
|
|
}
|
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
|
|
|
|
Make dupcat() into a variadic macro.
Up until now, it's been a variadic _function_, whose argument list
consists of 'const char *' ASCIZ strings to concatenate, terminated by
one containing a null pointer. Now, that function is dupcat_fn(), and
it's wrapped by a C99 variadic _macro_ called dupcat(), which
automatically suffixes the null-pointer terminating argument.
This has three benefits. Firstly, it's just less effort at every call
site. Secondly, it protects against the risk of accidentally leaving
off the NULL, causing arbitrary words of stack memory to be
dereferenced as char pointers. And thirdly, it protects against the
more subtle risk of writing a bare 'NULL' as the terminating argument,
instead of casting it explicitly to a pointer. That last one is
necessary because C permits the macro NULL to expand to an integer
constant such as 0, so NULL by itself may not have pointer type, and
worse, it may not be marshalled in a variadic argument list in the
same way as a pointer. (For example, on a 64-bit machine it might only
occupy 32 bits. And yet, on another 64-bit platform, it might work
just fine, so that you don't notice the mistake!)
I was inspired to do this by happening to notice one of those bare
NULL terminators, and thinking I'd better check if there were any
more. Turned out there were quite a few. Now there are none.
2019-10-14 18:42:37 +00:00
|
|
|
settingname = dupcat(name, "Height");
|
2011-10-01 17:38:59 +00:00
|
|
|
height = read_setting_i(handle, settingname, INT_MIN);
|
2003-02-01 12:54:40 +00:00
|
|
|
sfree(settingname);
|
2013-07-22 07:11:54 +00:00
|
|
|
if (height == INT_MIN) {
|
|
|
|
sfree(fontname);
|
|
|
|
return NULL;
|
|
|
|
}
|
2011-10-01 17:38:59 +00:00
|
|
|
|
2013-07-22 07:11:54 +00:00
|
|
|
ret = fontspec_new(fontname, isbold, height, charset);
|
|
|
|
sfree(fontname);
|
|
|
|
return ret;
|
2003-02-01 12:54:40 +00:00
|
|
|
}
|
|
|
|
|
2018-09-14 07:45:42 +00:00
|
|
|
void write_setting_fontspec(settings_w *handle,
|
|
|
|
const char *name, FontSpec *font)
|
2003-02-01 12:54:40 +00:00
|
|
|
{
|
|
|
|
char *settingname;
|
|
|
|
|
2011-10-01 17:38:59 +00:00
|
|
|
write_setting_s(handle, name, font->name);
|
Make dupcat() into a variadic macro.
Up until now, it's been a variadic _function_, whose argument list
consists of 'const char *' ASCIZ strings to concatenate, terminated by
one containing a null pointer. Now, that function is dupcat_fn(), and
it's wrapped by a C99 variadic _macro_ called dupcat(), which
automatically suffixes the null-pointer terminating argument.
This has three benefits. Firstly, it's just less effort at every call
site. Secondly, it protects against the risk of accidentally leaving
off the NULL, causing arbitrary words of stack memory to be
dereferenced as char pointers. And thirdly, it protects against the
more subtle risk of writing a bare 'NULL' as the terminating argument,
instead of casting it explicitly to a pointer. That last one is
necessary because C permits the macro NULL to expand to an integer
constant such as 0, so NULL by itself may not have pointer type, and
worse, it may not be marshalled in a variadic argument list in the
same way as a pointer. (For example, on a 64-bit machine it might only
occupy 32 bits. And yet, on another 64-bit platform, it might work
just fine, so that you don't notice the mistake!)
I was inspired to do this by happening to notice one of those bare
NULL terminators, and thinking I'd better check if there were any
more. Turned out there were quite a few. Now there are none.
2019-10-14 18:42:37 +00:00
|
|
|
settingname = dupcat(name, "IsBold");
|
2011-10-01 17:38:59 +00:00
|
|
|
write_setting_i(handle, settingname, font->isbold);
|
2003-02-01 12:54:40 +00:00
|
|
|
sfree(settingname);
|
Make dupcat() into a variadic macro.
Up until now, it's been a variadic _function_, whose argument list
consists of 'const char *' ASCIZ strings to concatenate, terminated by
one containing a null pointer. Now, that function is dupcat_fn(), and
it's wrapped by a C99 variadic _macro_ called dupcat(), which
automatically suffixes the null-pointer terminating argument.
This has three benefits. Firstly, it's just less effort at every call
site. Secondly, it protects against the risk of accidentally leaving
off the NULL, causing arbitrary words of stack memory to be
dereferenced as char pointers. And thirdly, it protects against the
more subtle risk of writing a bare 'NULL' as the terminating argument,
instead of casting it explicitly to a pointer. That last one is
necessary because C permits the macro NULL to expand to an integer
constant such as 0, so NULL by itself may not have pointer type, and
worse, it may not be marshalled in a variadic argument list in the
same way as a pointer. (For example, on a 64-bit machine it might only
occupy 32 bits. And yet, on another 64-bit platform, it might work
just fine, so that you don't notice the mistake!)
I was inspired to do this by happening to notice one of those bare
NULL terminators, and thinking I'd better check if there were any
more. Turned out there were quite a few. Now there are none.
2019-10-14 18:42:37 +00:00
|
|
|
settingname = dupcat(name, "CharSet");
|
2011-10-01 17:38:59 +00:00
|
|
|
write_setting_i(handle, settingname, font->charset);
|
2003-02-01 12:54:40 +00:00
|
|
|
sfree(settingname);
|
Make dupcat() into a variadic macro.
Up until now, it's been a variadic _function_, whose argument list
consists of 'const char *' ASCIZ strings to concatenate, terminated by
one containing a null pointer. Now, that function is dupcat_fn(), and
it's wrapped by a C99 variadic _macro_ called dupcat(), which
automatically suffixes the null-pointer terminating argument.
This has three benefits. Firstly, it's just less effort at every call
site. Secondly, it protects against the risk of accidentally leaving
off the NULL, causing arbitrary words of stack memory to be
dereferenced as char pointers. And thirdly, it protects against the
more subtle risk of writing a bare 'NULL' as the terminating argument,
instead of casting it explicitly to a pointer. That last one is
necessary because C permits the macro NULL to expand to an integer
constant such as 0, so NULL by itself may not have pointer type, and
worse, it may not be marshalled in a variadic argument list in the
same way as a pointer. (For example, on a 64-bit machine it might only
occupy 32 bits. And yet, on another 64-bit platform, it might work
just fine, so that you don't notice the mistake!)
I was inspired to do this by happening to notice one of those bare
NULL terminators, and thinking I'd better check if there were any
more. Turned out there were quite a few. Now there are none.
2019-10-14 18:42:37 +00:00
|
|
|
settingname = dupcat(name, "Height");
|
2011-10-01 17:38:59 +00:00
|
|
|
write_setting_i(handle, settingname, font->height);
|
2003-02-01 12:54:40 +00:00
|
|
|
sfree(settingname);
|
|
|
|
}
|
|
|
|
|
2018-09-14 07:45:42 +00:00
|
|
|
Filename *read_setting_filename(settings_r *handle, const char *name)
|
2003-02-01 12:54:40 +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
|
|
|
char *tmp = read_setting_s(handle, name);
|
|
|
|
if (tmp) {
|
2011-10-02 11:01:57 +00:00
|
|
|
Filename *ret = filename_from_str(tmp);
|
2019-09-08 19:29:00 +00:00
|
|
|
sfree(tmp);
|
|
|
|
return ret;
|
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
|
|
|
} else
|
2019-09-08 19:29:00 +00:00
|
|
|
return NULL;
|
2003-02-01 12:54:40 +00:00
|
|
|
}
|
|
|
|
|
2018-09-14 07:45:42 +00:00
|
|
|
void write_setting_filename(settings_w *handle,
|
|
|
|
const char *name, Filename *result)
|
2003-02-01 12:54:40 +00:00
|
|
|
{
|
2011-10-02 11:01:57 +00:00
|
|
|
write_setting_s(handle, name, result->path);
|
2003-02-01 12:54:40 +00:00
|
|
|
}
|
|
|
|
|
2018-09-14 07:45:42 +00:00
|
|
|
void close_settings_r(settings_r *handle)
|
2001-05-06 14:35:20 +00:00
|
|
|
{
|
2019-02-27 20:29:13 +00:00
|
|
|
if (handle) {
|
2022-04-22 09:01:01 +00:00
|
|
|
close_regkey(handle->sesskey);
|
2019-02-27 20:29:13 +00:00
|
|
|
sfree(handle);
|
|
|
|
}
|
2000-09-27 16:21:52 +00:00
|
|
|
}
|
|
|
|
|
2003-01-14 18:43:45 +00:00
|
|
|
void del_settings(const char *sessionname)
|
2001-05-06 14:35:20 +00:00
|
|
|
{
|
2022-04-22 09:01:01 +00:00
|
|
|
HKEY rkey = open_regkey(false, HKEY_CURRENT_USER, puttystr);
|
|
|
|
if (!rkey)
|
2019-09-08 19:29:00 +00:00
|
|
|
return;
|
2000-09-27 16:21:52 +00:00
|
|
|
|
2022-04-22 09:01:01 +00:00
|
|
|
strbuf *sb = strbuf_new();
|
Rework mungestr() and unmungestr().
For a start, they now have different names on Windows and Unix,
reflecting their different roles: on Windows they apply escaping to
any string that's going to be used as a registry key (be it a session
name, or a host name for host key storage), whereas on Unix they're
for constructing saved-session file names in particular (and also
handle the special case of filling in "Default Settings" for NULL).
Also, they now produce output by writing to a strbuf, which simplifies
a lot of the call sites. In particular, the strbuf output idiom is
passed on to enum_settings_next, which is especially nice because its
only actual caller was doing an ad-hoc realloc loop that I can now get
rid of completely.
Thirdly, on Windows they're centralised into winmisc.c instead of
living in winstore.c, because that way Pageant can use the unescape
function too. (It was spotting the duplication there that made me
think of doing this in the first place, but once I'd started, I had to
keep unravelling the thread...)
2018-11-03 08:58:41 +00:00
|
|
|
escape_registry_key(sessionname, sb);
|
2022-04-22 09:01:01 +00:00
|
|
|
del_regkey(rkey, sb->s);
|
Rework mungestr() and unmungestr().
For a start, they now have different names on Windows and Unix,
reflecting their different roles: on Windows they apply escaping to
any string that's going to be used as a registry key (be it a session
name, or a host name for host key storage), whereas on Unix they're
for constructing saved-session file names in particular (and also
handle the special case of filling in "Default Settings" for NULL).
Also, they now produce output by writing to a strbuf, which simplifies
a lot of the call sites. In particular, the strbuf output idiom is
passed on to enum_settings_next, which is especially nice because its
only actual caller was doing an ad-hoc realloc loop that I can now get
rid of completely.
Thirdly, on Windows they're centralised into winmisc.c instead of
living in winstore.c, because that way Pageant can use the unescape
function too. (It was spotting the duplication there that made me
think of doing this in the first place, but once I'd started, I had to
keep unravelling the thread...)
2018-11-03 08:58:41 +00:00
|
|
|
strbuf_free(sb);
|
2000-09-27 16:21:52 +00:00
|
|
|
|
2022-04-22 09:01:01 +00:00
|
|
|
close_regkey(rkey);
|
2010-12-23 17:32:28 +00:00
|
|
|
|
|
|
|
remove_session_from_jumplist(sessionname);
|
2000-09-27 16:21:52 +00:00
|
|
|
}
|
2000-09-27 15:21:04 +00:00
|
|
|
|
2018-09-14 07:45:42 +00:00
|
|
|
struct settings_e {
|
2000-09-27 16:21:52 +00:00
|
|
|
HKEY key;
|
|
|
|
int i;
|
|
|
|
};
|
|
|
|
|
2018-09-14 07:45:42 +00:00
|
|
|
settings_e *enum_settings_start(void)
|
2001-05-06 14:35:20 +00:00
|
|
|
{
|
2022-04-22 09:01:01 +00:00
|
|
|
HKEY key = open_regkey(false, HKEY_CURRENT_USER, puttystr);
|
|
|
|
if (!key)
|
2019-09-08 19:29:00 +00:00
|
|
|
return NULL;
|
2000-09-27 16:21:52 +00:00
|
|
|
|
2022-04-22 09:01:01 +00:00
|
|
|
settings_e *ret = snew(settings_e);
|
2000-09-27 16:21:52 +00:00
|
|
|
if (ret) {
|
2019-09-08 19:29:00 +00:00
|
|
|
ret->key = key;
|
|
|
|
ret->i = 0;
|
2000-09-27 16:21:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
Rework mungestr() and unmungestr().
For a start, they now have different names on Windows and Unix,
reflecting their different roles: on Windows they apply escaping to
any string that's going to be used as a registry key (be it a session
name, or a host name for host key storage), whereas on Unix they're
for constructing saved-session file names in particular (and also
handle the special case of filling in "Default Settings" for NULL).
Also, they now produce output by writing to a strbuf, which simplifies
a lot of the call sites. In particular, the strbuf output idiom is
passed on to enum_settings_next, which is especially nice because its
only actual caller was doing an ad-hoc realloc loop that I can now get
rid of completely.
Thirdly, on Windows they're centralised into winmisc.c instead of
living in winstore.c, because that way Pageant can use the unescape
function too. (It was spotting the duplication there that made me
think of doing this in the first place, but once I'd started, I had to
keep unravelling the thread...)
2018-11-03 08:58:41 +00:00
|
|
|
bool enum_settings_next(settings_e *e, strbuf *sb)
|
2001-05-06 14:35:20 +00:00
|
|
|
{
|
2022-04-22 09:01:01 +00:00
|
|
|
char *name = enum_regkey(e->key, e->i);
|
|
|
|
if (!name)
|
|
|
|
return false;
|
Rework mungestr() and unmungestr().
For a start, they now have different names on Windows and Unix,
reflecting their different roles: on Windows they apply escaping to
any string that's going to be used as a registry key (be it a session
name, or a host name for host key storage), whereas on Unix they're
for constructing saved-session file names in particular (and also
handle the special case of filling in "Default Settings" for NULL).
Also, they now produce output by writing to a strbuf, which simplifies
a lot of the call sites. In particular, the strbuf output idiom is
passed on to enum_settings_next, which is especially nice because its
only actual caller was doing an ad-hoc realloc loop that I can now get
rid of completely.
Thirdly, on Windows they're centralised into winmisc.c instead of
living in winstore.c, because that way Pageant can use the unescape
function too. (It was spotting the duplication there that made me
think of doing this in the first place, but once I'd started, I had to
keep unravelling the thread...)
2018-11-03 08:58:41 +00:00
|
|
|
|
2022-04-22 09:01:01 +00:00
|
|
|
unescape_registry_key(name, sb);
|
|
|
|
sfree(name);
|
2019-08-04 08:18:46 +00:00
|
|
|
e->i++;
|
2022-04-22 09:01:01 +00:00
|
|
|
return true;
|
2000-09-27 16:21:52 +00:00
|
|
|
}
|
|
|
|
|
2018-09-14 07:45:42 +00:00
|
|
|
void enum_settings_finish(settings_e *e)
|
2001-05-06 14:35:20 +00:00
|
|
|
{
|
2022-04-22 09:01:01 +00:00
|
|
|
close_regkey(e->key);
|
2000-12-12 10:33:13 +00:00
|
|
|
sfree(e);
|
2000-09-27 16:21:52 +00:00
|
|
|
}
|
|
|
|
|
Rework mungestr() and unmungestr().
For a start, they now have different names on Windows and Unix,
reflecting their different roles: on Windows they apply escaping to
any string that's going to be used as a registry key (be it a session
name, or a host name for host key storage), whereas on Unix they're
for constructing saved-session file names in particular (and also
handle the special case of filling in "Default Settings" for NULL).
Also, they now produce output by writing to a strbuf, which simplifies
a lot of the call sites. In particular, the strbuf output idiom is
passed on to enum_settings_next, which is especially nice because its
only actual caller was doing an ad-hoc realloc loop that I can now get
rid of completely.
Thirdly, on Windows they're centralised into winmisc.c instead of
living in winstore.c, because that way Pageant can use the unescape
function too. (It was spotting the duplication there that made me
think of doing this in the first place, but once I'd started, I had to
keep unravelling the thread...)
2018-11-03 08:58:41 +00:00
|
|
|
static void hostkey_regname(strbuf *sb, const char *hostname,
|
2019-09-08 19:29:00 +00:00
|
|
|
int port, const char *keytype)
|
2001-05-06 14:35:20 +00:00
|
|
|
{
|
2021-11-19 10:23:32 +00:00
|
|
|
put_fmt(sb, "%s@%d:", keytype, port);
|
Rework mungestr() and unmungestr().
For a start, they now have different names on Windows and Unix,
reflecting their different roles: on Windows they apply escaping to
any string that's going to be used as a registry key (be it a session
name, or a host name for host key storage), whereas on Unix they're
for constructing saved-session file names in particular (and also
handle the special case of filling in "Default Settings" for NULL).
Also, they now produce output by writing to a strbuf, which simplifies
a lot of the call sites. In particular, the strbuf output idiom is
passed on to enum_settings_next, which is especially nice because its
only actual caller was doing an ad-hoc realloc loop that I can now get
rid of completely.
Thirdly, on Windows they're centralised into winmisc.c instead of
living in winstore.c, because that way Pageant can use the unescape
function too. (It was spotting the duplication there that made me
think of doing this in the first place, but once I'd started, I had to
keep unravelling the thread...)
2018-11-03 08:58:41 +00:00
|
|
|
escape_registry_key(hostname, sb);
|
2000-09-28 08:37:10 +00:00
|
|
|
}
|
|
|
|
|
Reorganise host key checking and confirmation.
Previously, checking the host key against the persistent cache managed
by the storage.h API was done as part of the seat_verify_ssh_host_key
method, i.e. separately by each Seat.
Now that check is done by verify_ssh_host_key(), which is a new
function in ssh/common.c that centralises all the parts of host key
checking that don't need an interactive prompt. It subsumes the
previous verify_ssh_manual_host_key() that checked against the Conf,
and it does the check against the storage API that each Seat was
previously doing separately. If it can't confirm or definitively
reject the host key by itself, _then_ it calls out to the Seat, once
an interactive prompt is definitely needed.
The main point of doing this is so that when SshProxy forwards a Seat
call from the proxy SSH connection to the primary Seat, it won't print
an announcement of which connection is involved unless it's actually
going to do something interactive. (Not that we're printing those
announcements _yet_ anyway, but this is a piece of groundwork that
works towards doing so.)
But while I'm at it, I've also taken the opportunity to clean things
up a bit by renaming functions sensibly. Previously we had three very
similarly named functions verify_ssh_manual_host_key(), SeatVtable's
'verify_ssh_host_key' method, and verify_host_key() in storage.h. Now
the Seat method is called 'confirm' rather than 'verify' (since its
job is now always to print an interactive prompt, so it looks more
like the other confirm_foo methods), and the storage.h function is
called check_stored_host_key(), which goes better with store_host_key
and avoids having too many functions with similar names. And the
'manual' function is subsumed into the new centralised code, so
there's now just *one* host key function with 'verify' in the name.
Several functions are reindented in this commit. Best viewed with
whitespace changes ignored.
2021-10-25 17:12:17 +00:00
|
|
|
int check_stored_host_key(const char *hostname, int port,
|
|
|
|
const char *keytype, const char *key)
|
2001-05-06 14:35:20 +00:00
|
|
|
{
|
2000-09-27 15:21:04 +00:00
|
|
|
/*
|
2022-04-22 09:01:01 +00:00
|
|
|
* Read a saved key in from the registry and see what it says.
|
2000-09-27 15:21:04 +00:00
|
|
|
*/
|
2022-04-22 09:01:01 +00:00
|
|
|
strbuf *regname = strbuf_new();
|
2000-09-28 08:37:10 +00:00
|
|
|
hostkey_regname(regname, hostname, port, keytype);
|
2000-09-27 15:21:04 +00:00
|
|
|
|
2022-04-22 09:01:01 +00:00
|
|
|
HKEY rkey = open_regkey(false, HKEY_CURRENT_USER,
|
|
|
|
PUTTY_REG_POS "\\SshHostKeys");
|
|
|
|
if (!rkey) {
|
Rework mungestr() and unmungestr().
For a start, they now have different names on Windows and Unix,
reflecting their different roles: on Windows they apply escaping to
any string that's going to be used as a registry key (be it a session
name, or a host name for host key storage), whereas on Unix they're
for constructing saved-session file names in particular (and also
handle the special case of filling in "Default Settings" for NULL).
Also, they now produce output by writing to a strbuf, which simplifies
a lot of the call sites. In particular, the strbuf output idiom is
passed on to enum_settings_next, which is especially nice because its
only actual caller was doing an ad-hoc realloc loop that I can now get
rid of completely.
Thirdly, on Windows they're centralised into winmisc.c instead of
living in winstore.c, because that way Pageant can use the unescape
function too. (It was spotting the duplication there that made me
think of doing this in the first place, but once I'd started, I had to
keep unravelling the thread...)
2018-11-03 08:58:41 +00:00
|
|
|
strbuf_free(regname);
|
2019-09-08 19:29:00 +00:00
|
|
|
return 1; /* key does not exist in registry */
|
2013-07-22 07:11:54 +00:00
|
|
|
}
|
2000-09-27 15:21:04 +00:00
|
|
|
|
2022-04-22 09:01:01 +00:00
|
|
|
char *otherstr = get_reg_sz(rkey, regname->s);
|
|
|
|
if (!otherstr && !strcmp(keytype, "rsa")) {
|
2019-09-08 19:29:00 +00:00
|
|
|
/*
|
|
|
|
* Key didn't exist. If the key type is RSA, we'll try
|
|
|
|
* another trick, which is to look up the _old_ key format
|
|
|
|
* under just the hostname and translate that.
|
|
|
|
*/
|
|
|
|
char *justhost = regname->s + 1 + strcspn(regname->s, ":");
|
2022-04-22 09:01:01 +00:00
|
|
|
char *oldstyle = get_reg_sz(rkey, justhost);
|
2019-09-08 19:29:00 +00:00
|
|
|
|
2022-04-22 09:01:01 +00:00
|
|
|
if (oldstyle) {
|
2019-09-08 19:29:00 +00:00
|
|
|
/*
|
|
|
|
* The old format is two old-style bignums separated by
|
|
|
|
* a slash. An old-style bignum is made of groups of
|
|
|
|
* four hex digits: digits are ordered in sensible
|
|
|
|
* (most to least significant) order within each group,
|
|
|
|
* but groups are ordered in silly (least to most)
|
|
|
|
* order within the bignum. The new format is two
|
|
|
|
* ordinary C-format hex numbers (0xABCDEFG...XYZ, with
|
|
|
|
* A nonzero except in the special case 0x0, which
|
|
|
|
* doesn't appear anyway in RSA keys) separated by a
|
|
|
|
* comma. All hex digits are lowercase in both formats.
|
|
|
|
*/
|
2022-04-27 15:33:23 +00:00
|
|
|
strbuf *new = strbuf_new();
|
|
|
|
const char *q = oldstyle;
|
2019-09-08 19:29:00 +00:00
|
|
|
int i, j;
|
|
|
|
|
|
|
|
for (i = 0; i < 2; i++) {
|
|
|
|
int ndigits, nwords;
|
2022-04-27 15:33:23 +00:00
|
|
|
put_datapl(new, PTRLEN_LITERAL("0x"));
|
2019-09-08 19:29:00 +00:00
|
|
|
ndigits = strcspn(q, "/"); /* find / or end of string */
|
|
|
|
nwords = ndigits / 4;
|
|
|
|
/* now trim ndigits to remove leading zeros */
|
|
|
|
while (q[(ndigits - 1) ^ 3] == '0' && ndigits > 1)
|
|
|
|
ndigits--;
|
|
|
|
/* now move digits over to new string */
|
2022-04-27 15:33:23 +00:00
|
|
|
for (j = ndigits; j-- > 0 ;)
|
|
|
|
put_byte(new, q[j ^ 3]);
|
2019-09-08 19:29:00 +00:00
|
|
|
q += nwords * 4;
|
|
|
|
if (*q) {
|
2022-04-27 15:33:23 +00:00
|
|
|
q++; /* eat the slash */
|
|
|
|
put_byte(new, ','); /* add a comma */
|
2019-09-08 19:29:00 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Now _if_ this key matches, we'll enter it in the new
|
|
|
|
* format. If not, we'll assume something odd went
|
|
|
|
* wrong, and hyper-cautiously do nothing.
|
|
|
|
*/
|
2022-04-28 11:50:00 +00:00
|
|
|
if (!strcmp(new->s, key)) {
|
2022-04-27 15:33:23 +00:00
|
|
|
put_reg_sz(rkey, regname->s, new->s);
|
2022-04-28 11:50:00 +00:00
|
|
|
otherstr = strbuf_to_str(new);
|
|
|
|
} else {
|
|
|
|
strbuf_free(new);
|
|
|
|
}
|
2019-09-08 19:29:00 +00:00
|
|
|
}
|
2013-07-22 07:11:54 +00:00
|
|
|
|
|
|
|
sfree(oldstyle);
|
2000-09-27 15:21:04 +00:00
|
|
|
}
|
|
|
|
|
2022-04-22 09:01:01 +00:00
|
|
|
close_regkey(rkey);
|
2000-09-27 15:21:04 +00:00
|
|
|
|
2022-04-22 09:01:01 +00:00
|
|
|
int compare = otherstr ? strcmp(otherstr, key) : -1;
|
2000-09-27 15:21:04 +00:00
|
|
|
|
|
|
|
sfree(otherstr);
|
Rework mungestr() and unmungestr().
For a start, they now have different names on Windows and Unix,
reflecting their different roles: on Windows they apply escaping to
any string that's going to be used as a registry key (be it a session
name, or a host name for host key storage), whereas on Unix they're
for constructing saved-session file names in particular (and also
handle the special case of filling in "Default Settings" for NULL).
Also, they now produce output by writing to a strbuf, which simplifies
a lot of the call sites. In particular, the strbuf output idiom is
passed on to enum_settings_next, which is especially nice because its
only actual caller was doing an ad-hoc realloc loop that I can now get
rid of completely.
Thirdly, on Windows they're centralised into winmisc.c instead of
living in winstore.c, because that way Pageant can use the unescape
function too. (It was spotting the duplication there that made me
think of doing this in the first place, but once I'd started, I had to
keep unravelling the thread...)
2018-11-03 08:58:41 +00:00
|
|
|
strbuf_free(regname);
|
2000-09-27 15:21:04 +00:00
|
|
|
|
2022-04-22 09:01:01 +00:00
|
|
|
if (!otherstr)
|
2019-09-08 19:29:00 +00:00
|
|
|
return 1; /* key does not exist in registry */
|
2022-04-22 09:01:01 +00:00
|
|
|
else if (compare)
|
|
|
|
return 2; /* key is different in registry */
|
2000-09-27 15:21:04 +00:00
|
|
|
else
|
2019-09-08 19:29:00 +00:00
|
|
|
return 0; /* key matched OK in registry */
|
2000-09-27 15:21:04 +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 have_ssh_host_key(const char *hostname, int port,
|
2019-09-08 19:29:00 +00:00
|
|
|
const char *keytype)
|
2015-05-29 21:40:50 +00:00
|
|
|
{
|
|
|
|
/*
|
Reorganise host key checking and confirmation.
Previously, checking the host key against the persistent cache managed
by the storage.h API was done as part of the seat_verify_ssh_host_key
method, i.e. separately by each Seat.
Now that check is done by verify_ssh_host_key(), which is a new
function in ssh/common.c that centralises all the parts of host key
checking that don't need an interactive prompt. It subsumes the
previous verify_ssh_manual_host_key() that checked against the Conf,
and it does the check against the storage API that each Seat was
previously doing separately. If it can't confirm or definitively
reject the host key by itself, _then_ it calls out to the Seat, once
an interactive prompt is definitely needed.
The main point of doing this is so that when SshProxy forwards a Seat
call from the proxy SSH connection to the primary Seat, it won't print
an announcement of which connection is involved unless it's actually
going to do something interactive. (Not that we're printing those
announcements _yet_ anyway, but this is a piece of groundwork that
works towards doing so.)
But while I'm at it, I've also taken the opportunity to clean things
up a bit by renaming functions sensibly. Previously we had three very
similarly named functions verify_ssh_manual_host_key(), SeatVtable's
'verify_ssh_host_key' method, and verify_host_key() in storage.h. Now
the Seat method is called 'confirm' rather than 'verify' (since its
job is now always to print an interactive prompt, so it looks more
like the other confirm_foo methods), and the storage.h function is
called check_stored_host_key(), which goes better with store_host_key
and avoids having too many functions with similar names. And the
'manual' function is subsumed into the new centralised code, so
there's now just *one* host key function with 'verify' in the name.
Several functions are reindented in this commit. Best viewed with
whitespace changes ignored.
2021-10-25 17:12:17 +00:00
|
|
|
* If we have a host key, check_stored_host_key will return 0 or 2.
|
2015-05-29 21:40:50 +00:00
|
|
|
* If we don't have one, it'll return 1.
|
|
|
|
*/
|
Reorganise host key checking and confirmation.
Previously, checking the host key against the persistent cache managed
by the storage.h API was done as part of the seat_verify_ssh_host_key
method, i.e. separately by each Seat.
Now that check is done by verify_ssh_host_key(), which is a new
function in ssh/common.c that centralises all the parts of host key
checking that don't need an interactive prompt. It subsumes the
previous verify_ssh_manual_host_key() that checked against the Conf,
and it does the check against the storage API that each Seat was
previously doing separately. If it can't confirm or definitively
reject the host key by itself, _then_ it calls out to the Seat, once
an interactive prompt is definitely needed.
The main point of doing this is so that when SshProxy forwards a Seat
call from the proxy SSH connection to the primary Seat, it won't print
an announcement of which connection is involved unless it's actually
going to do something interactive. (Not that we're printing those
announcements _yet_ anyway, but this is a piece of groundwork that
works towards doing so.)
But while I'm at it, I've also taken the opportunity to clean things
up a bit by renaming functions sensibly. Previously we had three very
similarly named functions verify_ssh_manual_host_key(), SeatVtable's
'verify_ssh_host_key' method, and verify_host_key() in storage.h. Now
the Seat method is called 'confirm' rather than 'verify' (since its
job is now always to print an interactive prompt, so it looks more
like the other confirm_foo methods), and the storage.h function is
called check_stored_host_key(), which goes better with store_host_key
and avoids having too many functions with similar names. And the
'manual' function is subsumed into the new centralised code, so
there's now just *one* host key function with 'verify' in the name.
Several functions are reindented in this commit. Best viewed with
whitespace changes ignored.
2021-10-25 17:12:17 +00:00
|
|
|
return check_stored_host_key(hostname, port, keytype, "") != 1;
|
2015-05-29 21:40:50 +00:00
|
|
|
}
|
|
|
|
|
2003-01-14 18:43:45 +00:00
|
|
|
void store_host_key(const char *hostname, int port,
|
2019-09-08 19:29:00 +00:00
|
|
|
const char *keytype, const char *key)
|
2001-05-06 14:35:20 +00:00
|
|
|
{
|
2022-04-22 09:01:01 +00:00
|
|
|
strbuf *regname = strbuf_new();
|
2000-09-28 08:37:10 +00:00
|
|
|
hostkey_regname(regname, hostname, port, keytype);
|
2000-09-27 15:21:04 +00:00
|
|
|
|
2022-04-22 09:01:01 +00:00
|
|
|
HKEY rkey = open_regkey(true, HKEY_CURRENT_USER,
|
|
|
|
PUTTY_REG_POS "\\SshHostKeys");
|
|
|
|
if (rkey) {
|
|
|
|
put_reg_sz(rkey, regname->s, key);
|
|
|
|
close_regkey(rkey);
|
2005-05-20 21:52:07 +00:00
|
|
|
} /* else key does not exist in registry */
|
|
|
|
|
2018-11-07 21:12:21 +00:00
|
|
|
strbuf_free(regname);
|
2000-09-27 15:21:04 +00:00
|
|
|
}
|
|
|
|
|
Initial support for host certificates.
Now we offer the OpenSSH certificate key types in our KEXINIT host key
algorithm list, so that if the server has a certificate, they can send
it to us.
There's a new storage.h abstraction for representing a list of trusted
host CAs, and which ones are trusted to certify hosts for what
domains. This is stored outside the normal saved session data, because
the whole point of host certificates is to avoid per-host faffing.
Configuring this set of trusted CAs is done via a new GUI dialog box,
separate from the main PuTTY config box (because it modifies a single
set of settings across all saved sessions), which you can launch by
clicking a button in the 'Host keys' pane. The GUI is pretty crude for
the moment, and very much at a 'just about usable' stage right now. It
will want some polishing.
If we have no CA configured that matches the hostname, we don't offer
to receive certified host keys in the first place. So for existing
users who haven't set any of this up yet, nothing will immediately
change.
Currently, if we do offer to receive certified host keys and the
server presents one signed by a CA we don't trust, PuTTY will bomb out
unconditionally with an error, instead of offering a confirmation box.
That's an unfinished part which I plan to fix before this goes into a
release.
2022-04-22 11:07:24 +00:00
|
|
|
struct host_ca_enum {
|
|
|
|
HKEY key;
|
|
|
|
int i;
|
|
|
|
};
|
|
|
|
|
|
|
|
host_ca_enum *enum_host_ca_start(void)
|
|
|
|
{
|
|
|
|
host_ca_enum *e;
|
|
|
|
HKEY key;
|
|
|
|
|
|
|
|
if (!(key = open_regkey(false, HKEY_CURRENT_USER, host_ca_key)))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
e = snew(host_ca_enum);
|
|
|
|
e->key = key;
|
|
|
|
e->i = 0;
|
|
|
|
|
|
|
|
return e;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool enum_host_ca_next(host_ca_enum *e, strbuf *sb)
|
|
|
|
{
|
|
|
|
char *regbuf = enum_regkey(e->key, e->i);
|
|
|
|
if (!regbuf)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
unescape_registry_key(regbuf, sb);
|
|
|
|
sfree(regbuf);
|
|
|
|
e->i++;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void enum_host_ca_finish(host_ca_enum *e)
|
|
|
|
{
|
|
|
|
close_regkey(e->key);
|
|
|
|
sfree(e);
|
|
|
|
}
|
|
|
|
|
|
|
|
host_ca *host_ca_load(const char *name)
|
|
|
|
{
|
|
|
|
strbuf *sb;
|
|
|
|
const char *s;
|
|
|
|
|
|
|
|
sb = strbuf_new();
|
|
|
|
escape_registry_key(name, sb);
|
|
|
|
HKEY rkey = open_regkey(false, HKEY_CURRENT_USER, host_ca_key, sb->s);
|
|
|
|
strbuf_free(sb);
|
|
|
|
|
|
|
|
if (!rkey)
|
|
|
|
return NULL;
|
|
|
|
|
2022-05-02 06:40:52 +00:00
|
|
|
host_ca *hca = host_ca_new();
|
Initial support for host certificates.
Now we offer the OpenSSH certificate key types in our KEXINIT host key
algorithm list, so that if the server has a certificate, they can send
it to us.
There's a new storage.h abstraction for representing a list of trusted
host CAs, and which ones are trusted to certify hosts for what
domains. This is stored outside the normal saved session data, because
the whole point of host certificates is to avoid per-host faffing.
Configuring this set of trusted CAs is done via a new GUI dialog box,
separate from the main PuTTY config box (because it modifies a single
set of settings across all saved sessions), which you can launch by
clicking a button in the 'Host keys' pane. The GUI is pretty crude for
the moment, and very much at a 'just about usable' stage right now. It
will want some polishing.
If we have no CA configured that matches the hostname, we don't offer
to receive certified host keys in the first place. So for existing
users who haven't set any of this up yet, nothing will immediately
change.
Currently, if we do offer to receive certified host keys and the
server presents one signed by a CA we don't trust, PuTTY will bomb out
unconditionally with an error, instead of offering a confirmation box.
That's an unfinished part which I plan to fix before this goes into a
release.
2022-04-22 11:07:24 +00:00
|
|
|
hca->name = dupstr(name);
|
|
|
|
|
2022-05-02 09:18:16 +00:00
|
|
|
DWORD val;
|
|
|
|
|
Initial support for host certificates.
Now we offer the OpenSSH certificate key types in our KEXINIT host key
algorithm list, so that if the server has a certificate, they can send
it to us.
There's a new storage.h abstraction for representing a list of trusted
host CAs, and which ones are trusted to certify hosts for what
domains. This is stored outside the normal saved session data, because
the whole point of host certificates is to avoid per-host faffing.
Configuring this set of trusted CAs is done via a new GUI dialog box,
separate from the main PuTTY config box (because it modifies a single
set of settings across all saved sessions), which you can launch by
clicking a button in the 'Host keys' pane. The GUI is pretty crude for
the moment, and very much at a 'just about usable' stage right now. It
will want some polishing.
If we have no CA configured that matches the hostname, we don't offer
to receive certified host keys in the first place. So for existing
users who haven't set any of this up yet, nothing will immediately
change.
Currently, if we do offer to receive certified host keys and the
server presents one signed by a CA we don't trust, PuTTY will bomb out
unconditionally with an error, instead of offering a confirmation box.
That's an unfinished part which I plan to fix before this goes into a
release.
2022-04-22 11:07:24 +00:00
|
|
|
if ((s = get_reg_sz(rkey, "PublicKey")) != NULL)
|
|
|
|
hca->ca_public_key = base64_decode_sb(ptrlen_from_asciz(s));
|
|
|
|
|
|
|
|
if ((sb = get_reg_multi_sz(rkey, "MatchHosts")) != NULL) {
|
|
|
|
BinarySource src[1];
|
|
|
|
BinarySource_BARE_INIT_PL(src, ptrlen_from_strbuf(sb));
|
|
|
|
|
|
|
|
const char *wc;
|
|
|
|
size_t wcsize = 0;
|
|
|
|
while (wc = get_asciz(src), !get_err(src)) {
|
|
|
|
sgrowarray(hca->hostname_wildcards, wcsize,
|
|
|
|
hca->n_hostname_wildcards);
|
|
|
|
hca->hostname_wildcards[hca->n_hostname_wildcards++] = dupstr(wc);
|
|
|
|
}
|
|
|
|
|
|
|
|
strbuf_free(sb);
|
|
|
|
}
|
|
|
|
|
2022-05-02 09:18:16 +00:00
|
|
|
if (get_reg_dword(rkey, "PermitRSASHA1", &val))
|
|
|
|
hca->opts.permit_rsa_sha1 = val;
|
|
|
|
if (get_reg_dword(rkey, "PermitRSASHA256", &val))
|
|
|
|
hca->opts.permit_rsa_sha256 = val;
|
|
|
|
if (get_reg_dword(rkey, "PermitRSASHA512", &val))
|
|
|
|
hca->opts.permit_rsa_sha512 = val;
|
|
|
|
|
Initial support for host certificates.
Now we offer the OpenSSH certificate key types in our KEXINIT host key
algorithm list, so that if the server has a certificate, they can send
it to us.
There's a new storage.h abstraction for representing a list of trusted
host CAs, and which ones are trusted to certify hosts for what
domains. This is stored outside the normal saved session data, because
the whole point of host certificates is to avoid per-host faffing.
Configuring this set of trusted CAs is done via a new GUI dialog box,
separate from the main PuTTY config box (because it modifies a single
set of settings across all saved sessions), which you can launch by
clicking a button in the 'Host keys' pane. The GUI is pretty crude for
the moment, and very much at a 'just about usable' stage right now. It
will want some polishing.
If we have no CA configured that matches the hostname, we don't offer
to receive certified host keys in the first place. So for existing
users who haven't set any of this up yet, nothing will immediately
change.
Currently, if we do offer to receive certified host keys and the
server presents one signed by a CA we don't trust, PuTTY will bomb out
unconditionally with an error, instead of offering a confirmation box.
That's an unfinished part which I plan to fix before this goes into a
release.
2022-04-22 11:07:24 +00:00
|
|
|
close_regkey(rkey);
|
|
|
|
return hca;
|
|
|
|
}
|
|
|
|
|
|
|
|
char *host_ca_save(host_ca *hca)
|
|
|
|
{
|
|
|
|
if (!*hca->name)
|
|
|
|
return dupstr("CA record must have a name");
|
|
|
|
|
|
|
|
strbuf *sb = strbuf_new();
|
|
|
|
escape_registry_key(hca->name, sb);
|
|
|
|
HKEY rkey = open_regkey(true, HKEY_CURRENT_USER, host_ca_key, sb->s);
|
|
|
|
if (!rkey) {
|
|
|
|
char *err = dupprintf("Unable to create registry key\n"
|
|
|
|
"HKEY_CURRENT_USER\\%s\\%s", host_ca_key, sb->s);
|
|
|
|
strbuf_free(sb);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
strbuf_free(sb);
|
|
|
|
|
|
|
|
strbuf *base64_pubkey = base64_encode_sb(
|
|
|
|
ptrlen_from_strbuf(hca->ca_public_key), 0);
|
|
|
|
put_reg_sz(rkey, "PublicKey", base64_pubkey->s);
|
|
|
|
strbuf_free(base64_pubkey);
|
|
|
|
|
|
|
|
strbuf *wcs = strbuf_new();
|
|
|
|
for (size_t i = 0; i < hca->n_hostname_wildcards; i++)
|
|
|
|
put_asciz(wcs, hca->hostname_wildcards[i]);
|
|
|
|
put_reg_multi_sz(rkey, "MatchHosts", wcs);
|
|
|
|
strbuf_free(wcs);
|
|
|
|
|
2022-05-02 09:18:16 +00:00
|
|
|
put_reg_dword(rkey, "PermitRSASHA1", hca->opts.permit_rsa_sha1);
|
|
|
|
put_reg_dword(rkey, "PermitRSASHA256", hca->opts.permit_rsa_sha256);
|
|
|
|
put_reg_dword(rkey, "PermitRSASHA512", hca->opts.permit_rsa_sha512);
|
|
|
|
|
Initial support for host certificates.
Now we offer the OpenSSH certificate key types in our KEXINIT host key
algorithm list, so that if the server has a certificate, they can send
it to us.
There's a new storage.h abstraction for representing a list of trusted
host CAs, and which ones are trusted to certify hosts for what
domains. This is stored outside the normal saved session data, because
the whole point of host certificates is to avoid per-host faffing.
Configuring this set of trusted CAs is done via a new GUI dialog box,
separate from the main PuTTY config box (because it modifies a single
set of settings across all saved sessions), which you can launch by
clicking a button in the 'Host keys' pane. The GUI is pretty crude for
the moment, and very much at a 'just about usable' stage right now. It
will want some polishing.
If we have no CA configured that matches the hostname, we don't offer
to receive certified host keys in the first place. So for existing
users who haven't set any of this up yet, nothing will immediately
change.
Currently, if we do offer to receive certified host keys and the
server presents one signed by a CA we don't trust, PuTTY will bomb out
unconditionally with an error, instead of offering a confirmation box.
That's an unfinished part which I plan to fix before this goes into a
release.
2022-04-22 11:07:24 +00:00
|
|
|
close_regkey(rkey);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
char *host_ca_delete(const char *name)
|
|
|
|
{
|
|
|
|
HKEY rkey = open_regkey(false, HKEY_CURRENT_USER, host_ca_key);
|
|
|
|
if (!rkey)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
strbuf *sb = strbuf_new();
|
|
|
|
escape_registry_key(name, sb);
|
|
|
|
del_regkey(rkey, sb->s);
|
|
|
|
strbuf_free(sb);
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2000-09-27 15:21:04 +00:00
|
|
|
/*
|
2007-01-09 18:05:17 +00:00
|
|
|
* Open (or delete) the random seed file.
|
2000-09-27 15:21:04 +00:00
|
|
|
*/
|
2007-01-09 18:05:17 +00:00
|
|
|
enum { DEL, OPEN_R, OPEN_W };
|
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
|
|
|
static bool try_random_seed(char const *path, int action, HANDLE *ret)
|
2007-01-09 18:05:17 +00:00
|
|
|
{
|
|
|
|
if (action == DEL) {
|
2013-07-22 07:11:44 +00:00
|
|
|
if (!DeleteFile(path) && GetLastError() != ERROR_FILE_NOT_FOUND) {
|
|
|
|
nonfatal("Unable to delete '%s': %s", path,
|
|
|
|
win_strerror(GetLastError()));
|
|
|
|
}
|
2019-09-08 19:29:00 +00:00
|
|
|
*ret = INVALID_HANDLE_VALUE;
|
|
|
|
return false; /* so we'll do the next ones too */
|
2007-01-09 18:05:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
*ret = CreateFile(path,
|
2019-09-08 19:29:00 +00:00
|
|
|
action == OPEN_W ? GENERIC_WRITE : GENERIC_READ,
|
|
|
|
action == OPEN_W ? 0 : (FILE_SHARE_READ |
|
|
|
|
FILE_SHARE_WRITE),
|
|
|
|
NULL,
|
|
|
|
action == OPEN_W ? CREATE_ALWAYS : OPEN_EXISTING,
|
|
|
|
action == OPEN_W ? FILE_ATTRIBUTE_NORMAL : 0,
|
|
|
|
NULL);
|
2007-01-09 18:05:17 +00:00
|
|
|
|
|
|
|
return (*ret != INVALID_HANDLE_VALUE);
|
|
|
|
}
|
|
|
|
|
2019-06-30 14:21:08 +00:00
|
|
|
static bool try_random_seed_and_free(char *path, int action, HANDLE *hout)
|
|
|
|
{
|
|
|
|
bool retd = try_random_seed(path, action, hout);
|
|
|
|
sfree(path);
|
|
|
|
return retd;
|
|
|
|
}
|
|
|
|
|
2007-01-09 18:05:17 +00:00
|
|
|
static HANDLE access_random_seed(int action)
|
2001-05-06 14:35:20 +00:00
|
|
|
{
|
2007-01-09 18:05:17 +00:00
|
|
|
HANDLE rethandle;
|
2000-09-27 15:21:04 +00:00
|
|
|
|
2007-01-09 18:05:17 +00:00
|
|
|
/*
|
|
|
|
* Iterate over a selection of possible random seed paths until
|
|
|
|
* we find one that works.
|
2019-09-08 19:29:00 +00:00
|
|
|
*
|
2007-01-09 18:05:17 +00:00
|
|
|
* We do this iteration separately for reading and writing,
|
|
|
|
* meaning that we will automatically migrate random seed files
|
|
|
|
* if a better location becomes available (by reading from the
|
|
|
|
* best location in which we actually find one, and then
|
|
|
|
* writing to the best location in which we can _create_ one).
|
|
|
|
*/
|
2000-09-27 15:21:04 +00:00
|
|
|
|
2007-01-09 18:05:17 +00:00
|
|
|
/*
|
|
|
|
* First, try the location specified by the user in the
|
|
|
|
* Registry, if any.
|
|
|
|
*/
|
2019-06-30 14:21:08 +00:00
|
|
|
{
|
2022-04-22 09:01:01 +00:00
|
|
|
HKEY rkey = open_regkey(false, HKEY_CURRENT_USER, PUTTY_REG_POS);
|
|
|
|
if (rkey) {
|
|
|
|
char *regpath = get_reg_sz(rkey, "RandSeedFile");
|
|
|
|
close_regkey(rkey);
|
|
|
|
if (regpath) {
|
|
|
|
bool success = try_random_seed(regpath, action, &rethandle);
|
|
|
|
sfree(regpath);
|
|
|
|
if (success)
|
|
|
|
return rethandle;
|
|
|
|
}
|
2019-06-30 14:21:08 +00:00
|
|
|
}
|
2007-01-09 18:05:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Next, try the user's local Application Data directory,
|
|
|
|
* followed by their non-local one. This is found using the
|
|
|
|
* SHGetFolderPath function, which won't be present on all
|
|
|
|
* versions of Windows.
|
|
|
|
*/
|
|
|
|
if (!tried_shgetfolderpath) {
|
2019-09-08 19:29:00 +00:00
|
|
|
/* This is likely only to bear fruit on systems with IE5+
|
|
|
|
* installed, or WinMe/2K+. There is some faffing with
|
|
|
|
* SHFOLDER.DLL we could do to try to find an equivalent
|
|
|
|
* on older versions of Windows if we cared enough.
|
|
|
|
* However, the invocation below requires IE5+ anyway,
|
|
|
|
* so stuff that. */
|
|
|
|
shell32_module = load_system32_dll("shell32.dll");
|
|
|
|
GET_WINDOWS_FUNCTION(shell32_module, SHGetFolderPathA);
|
|
|
|
tried_shgetfolderpath = true;
|
2007-01-09 18:05:17 +00:00
|
|
|
}
|
2009-11-08 19:22:28 +00:00
|
|
|
if (p_SHGetFolderPathA) {
|
2019-06-30 14:21:08 +00:00
|
|
|
char profile[MAX_PATH + 1];
|
2019-09-08 19:29:00 +00:00
|
|
|
if (SUCCEEDED(p_SHGetFolderPathA(NULL, CSIDL_LOCAL_APPDATA,
|
|
|
|
NULL, SHGFP_TYPE_CURRENT, profile)) &&
|
Make dupcat() into a variadic macro.
Up until now, it's been a variadic _function_, whose argument list
consists of 'const char *' ASCIZ strings to concatenate, terminated by
one containing a null pointer. Now, that function is dupcat_fn(), and
it's wrapped by a C99 variadic _macro_ called dupcat(), which
automatically suffixes the null-pointer terminating argument.
This has three benefits. Firstly, it's just less effort at every call
site. Secondly, it protects against the risk of accidentally leaving
off the NULL, causing arbitrary words of stack memory to be
dereferenced as char pointers. And thirdly, it protects against the
more subtle risk of writing a bare 'NULL' as the terminating argument,
instead of casting it explicitly to a pointer. That last one is
necessary because C permits the macro NULL to expand to an integer
constant such as 0, so NULL by itself may not have pointer type, and
worse, it may not be marshalled in a variadic argument list in the
same way as a pointer. (For example, on a 64-bit machine it might only
occupy 32 bits. And yet, on another 64-bit platform, it might work
just fine, so that you don't notice the mistake!)
I was inspired to do this by happening to notice one of those bare
NULL terminators, and thinking I'd better check if there were any
more. Turned out there were quite a few. Now there are none.
2019-10-14 18:42:37 +00:00
|
|
|
try_random_seed_and_free(dupcat(profile, "\\PUTTY.RND"),
|
2019-06-30 14:21:08 +00:00
|
|
|
action, &rethandle))
|
|
|
|
return rethandle;
|
2007-01-09 18:05:17 +00:00
|
|
|
|
2019-09-08 19:29:00 +00:00
|
|
|
if (SUCCEEDED(p_SHGetFolderPathA(NULL, CSIDL_APPDATA,
|
|
|
|
NULL, SHGFP_TYPE_CURRENT, profile)) &&
|
Make dupcat() into a variadic macro.
Up until now, it's been a variadic _function_, whose argument list
consists of 'const char *' ASCIZ strings to concatenate, terminated by
one containing a null pointer. Now, that function is dupcat_fn(), and
it's wrapped by a C99 variadic _macro_ called dupcat(), which
automatically suffixes the null-pointer terminating argument.
This has three benefits. Firstly, it's just less effort at every call
site. Secondly, it protects against the risk of accidentally leaving
off the NULL, causing arbitrary words of stack memory to be
dereferenced as char pointers. And thirdly, it protects against the
more subtle risk of writing a bare 'NULL' as the terminating argument,
instead of casting it explicitly to a pointer. That last one is
necessary because C permits the macro NULL to expand to an integer
constant such as 0, so NULL by itself may not have pointer type, and
worse, it may not be marshalled in a variadic argument list in the
same way as a pointer. (For example, on a 64-bit machine it might only
occupy 32 bits. And yet, on another 64-bit platform, it might work
just fine, so that you don't notice the mistake!)
I was inspired to do this by happening to notice one of those bare
NULL terminators, and thinking I'd better check if there were any
more. Turned out there were quite a few. Now there are none.
2019-10-14 18:42:37 +00:00
|
|
|
try_random_seed_and_free(dupcat(profile, "\\PUTTY.RND"),
|
2019-06-30 14:21:08 +00:00
|
|
|
action, &rethandle))
|
|
|
|
return rethandle;
|
2007-01-09 18:05:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Failing that, try %HOMEDRIVE%%HOMEPATH% as a guess at the
|
|
|
|
* user's home directory.
|
|
|
|
*/
|
|
|
|
{
|
2019-09-08 19:29:00 +00:00
|
|
|
char drv[MAX_PATH], path[MAX_PATH];
|
2019-06-30 14:21:08 +00:00
|
|
|
|
|
|
|
DWORD drvlen = GetEnvironmentVariable("HOMEDRIVE", drv, sizeof(drv));
|
|
|
|
DWORD pathlen = GetEnvironmentVariable("HOMEPATH", path, sizeof(path));
|
|
|
|
|
|
|
|
/* We permit %HOMEDRIVE% to expand to an empty string, but if
|
|
|
|
* %HOMEPATH% does that, we abort the attempt. Same if either
|
|
|
|
* variable overflows its buffer. */
|
|
|
|
if (drvlen == 0)
|
|
|
|
drv[0] = '\0';
|
|
|
|
|
|
|
|
if (drvlen < lenof(drv) && pathlen < lenof(path) && pathlen > 0 &&
|
|
|
|
try_random_seed_and_free(
|
Make dupcat() into a variadic macro.
Up until now, it's been a variadic _function_, whose argument list
consists of 'const char *' ASCIZ strings to concatenate, terminated by
one containing a null pointer. Now, that function is dupcat_fn(), and
it's wrapped by a C99 variadic _macro_ called dupcat(), which
automatically suffixes the null-pointer terminating argument.
This has three benefits. Firstly, it's just less effort at every call
site. Secondly, it protects against the risk of accidentally leaving
off the NULL, causing arbitrary words of stack memory to be
dereferenced as char pointers. And thirdly, it protects against the
more subtle risk of writing a bare 'NULL' as the terminating argument,
instead of casting it explicitly to a pointer. That last one is
necessary because C permits the macro NULL to expand to an integer
constant such as 0, so NULL by itself may not have pointer type, and
worse, it may not be marshalled in a variadic argument list in the
same way as a pointer. (For example, on a 64-bit machine it might only
occupy 32 bits. And yet, on another 64-bit platform, it might work
just fine, so that you don't notice the mistake!)
I was inspired to do this by happening to notice one of those bare
NULL terminators, and thinking I'd better check if there were any
more. Turned out there were quite a few. Now there are none.
2019-10-14 18:42:37 +00:00
|
|
|
dupcat(drv, path, "\\PUTTY.RND"), action, &rethandle))
|
2019-06-30 14:21:08 +00:00
|
|
|
return rethandle;
|
2000-09-27 15:21:04 +00:00
|
|
|
}
|
2007-01-09 18:05:17 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* And finally, fall back to C:\WINDOWS.
|
|
|
|
*/
|
2019-06-30 14:21:08 +00:00
|
|
|
{
|
|
|
|
char windir[MAX_PATH];
|
|
|
|
DWORD len = GetWindowsDirectory(windir, sizeof(windir));
|
|
|
|
if (len < lenof(windir) &&
|
|
|
|
try_random_seed_and_free(
|
Make dupcat() into a variadic macro.
Up until now, it's been a variadic _function_, whose argument list
consists of 'const char *' ASCIZ strings to concatenate, terminated by
one containing a null pointer. Now, that function is dupcat_fn(), and
it's wrapped by a C99 variadic _macro_ called dupcat(), which
automatically suffixes the null-pointer terminating argument.
This has three benefits. Firstly, it's just less effort at every call
site. Secondly, it protects against the risk of accidentally leaving
off the NULL, causing arbitrary words of stack memory to be
dereferenced as char pointers. And thirdly, it protects against the
more subtle risk of writing a bare 'NULL' as the terminating argument,
instead of casting it explicitly to a pointer. That last one is
necessary because C permits the macro NULL to expand to an integer
constant such as 0, so NULL by itself may not have pointer type, and
worse, it may not be marshalled in a variadic argument list in the
same way as a pointer. (For example, on a 64-bit machine it might only
occupy 32 bits. And yet, on another 64-bit platform, it might work
just fine, so that you don't notice the mistake!)
I was inspired to do this by happening to notice one of those bare
NULL terminators, and thinking I'd better check if there were any
more. Turned out there were quite a few. Now there are none.
2019-10-14 18:42:37 +00:00
|
|
|
dupcat(windir, "\\PUTTY.RND"), action, &rethandle))
|
2019-06-30 14:21:08 +00:00
|
|
|
return rethandle;
|
|
|
|
}
|
2007-01-09 18:05:17 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* If even that failed, give up.
|
|
|
|
*/
|
|
|
|
return INVALID_HANDLE_VALUE;
|
2000-09-27 15:21:04 +00:00
|
|
|
}
|
|
|
|
|
2001-05-06 14:35:20 +00:00
|
|
|
void read_random_seed(noise_consumer_t consumer)
|
|
|
|
{
|
2007-01-09 18:05:17 +00:00
|
|
|
HANDLE seedf = access_random_seed(OPEN_R);
|
2000-09-27 15:21:04 +00:00
|
|
|
|
|
|
|
if (seedf != INVALID_HANDLE_VALUE) {
|
2019-09-08 19:29:00 +00:00
|
|
|
while (1) {
|
|
|
|
char buf[1024];
|
|
|
|
DWORD len;
|
|
|
|
|
|
|
|
if (ReadFile(seedf, buf, sizeof(buf), &len, NULL) && len)
|
|
|
|
consumer(buf, len);
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
CloseHandle(seedf);
|
2000-09-27 15:21:04 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-05-06 14:35:20 +00:00
|
|
|
void write_random_seed(void *data, int len)
|
|
|
|
{
|
2007-01-09 18:05:17 +00:00
|
|
|
HANDLE seedf = access_random_seed(OPEN_W);
|
2000-09-27 15:21:04 +00:00
|
|
|
|
|
|
|
if (seedf != INVALID_HANDLE_VALUE) {
|
2019-09-08 19:29:00 +00:00
|
|
|
DWORD lenwritten;
|
2000-09-27 15:21:04 +00:00
|
|
|
|
2019-09-08 19:29:00 +00:00
|
|
|
WriteFile(seedf, data, len, &lenwritten, NULL);
|
|
|
|
CloseHandle(seedf);
|
2000-09-27 15:21:04 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-12-23 17:32:28 +00:00
|
|
|
/*
|
|
|
|
* Internal function supporting the jump list registry code. All the
|
|
|
|
* functions to add, remove and read the list have substantially
|
|
|
|
* similar content, so this is a generalisation of all of them which
|
|
|
|
* transforms the list in the registry by prepending 'add' (if
|
|
|
|
* non-null), removing 'rem' from what's left (if non-null), and
|
|
|
|
* returning the resulting concatenated list of strings in 'out' (if
|
|
|
|
* non-null).
|
|
|
|
*/
|
|
|
|
static int transform_jumplist_registry
|
|
|
|
(const char *add, const char *rem, char **out)
|
|
|
|
{
|
2022-04-22 09:01:01 +00:00
|
|
|
HKEY rkey = open_regkey(true, HKEY_CURRENT_USER, reg_jumplist_key);
|
|
|
|
if (!rkey)
|
2019-09-08 19:29:00 +00:00
|
|
|
return JUMPLISTREG_ERROR_KEYOPENCREATE_FAILURE;
|
2010-12-23 17:32:28 +00:00
|
|
|
|
|
|
|
/* Get current list of saved sessions in the registry. */
|
2022-04-22 09:01:01 +00:00
|
|
|
strbuf *oldlist = get_reg_multi_sz(rkey, reg_jumplist_value);
|
|
|
|
if (!oldlist) {
|
|
|
|
/* Start again with the empty list. */
|
|
|
|
oldlist = strbuf_new();
|
|
|
|
put_data(oldlist, "\0\0", 2);
|
2010-12-23 17:32:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Modify the list, if we're modifying.
|
|
|
|
*/
|
2022-04-22 09:01:01 +00:00
|
|
|
bool write_failure = false;
|
2010-12-23 17:32:28 +00:00
|
|
|
if (add || rem) {
|
2022-04-22 09:01:01 +00:00
|
|
|
BinarySource src[1];
|
|
|
|
BinarySource_BARE_INIT_PL(src, ptrlen_from_strbuf(oldlist));
|
|
|
|
strbuf *newlist = strbuf_new();
|
2010-12-23 17:32:28 +00:00
|
|
|
|
|
|
|
/* First add the new item to the beginning of the list. */
|
2022-04-22 09:01:01 +00:00
|
|
|
if (add)
|
|
|
|
put_asciz(newlist, add);
|
|
|
|
|
2010-12-23 17:32:28 +00:00
|
|
|
/* Now add the existing list, taking care to leave out the removed
|
|
|
|
* item, if it was already in the existing list. */
|
2022-04-22 09:01:01 +00:00
|
|
|
while (true) {
|
|
|
|
const char *olditem = get_asciz(src);
|
|
|
|
if (get_err(src))
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (!rem || strcmp(olditem, rem) != 0) {
|
2010-12-23 17:32:28 +00:00
|
|
|
/* Check if this is a valid session, otherwise don't add. */
|
2022-04-22 09:01:01 +00:00
|
|
|
settings_r *psettings_tmp = open_settings_r(olditem);
|
2010-12-23 17:32:28 +00:00
|
|
|
if (psettings_tmp != NULL) {
|
|
|
|
close_settings_r(psettings_tmp);
|
2022-04-22 09:01:01 +00:00
|
|
|
put_asciz(newlist, olditem);
|
2010-12-23 17:32:28 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Save the new list to the registry. */
|
2022-04-22 09:01:01 +00:00
|
|
|
write_failure = !put_reg_multi_sz(rkey, reg_jumplist_value, newlist);
|
2010-12-23 17:32:28 +00:00
|
|
|
|
2022-04-22 09:01:01 +00:00
|
|
|
strbuf_free(oldlist);
|
|
|
|
oldlist = newlist;
|
|
|
|
}
|
2010-12-23 17:32:28 +00:00
|
|
|
|
2022-04-22 09:01:01 +00:00
|
|
|
close_regkey(rkey);
|
2010-12-23 17:32:28 +00:00
|
|
|
|
2022-04-22 09:01:01 +00:00
|
|
|
if (out && !write_failure)
|
|
|
|
*out = strbuf_to_str(oldlist);
|
|
|
|
else
|
|
|
|
strbuf_free(oldlist);
|
2010-12-23 17:32:28 +00:00
|
|
|
|
2022-04-22 09:01:01 +00:00
|
|
|
if (write_failure)
|
2010-12-23 17:32:28 +00:00
|
|
|
return JUMPLISTREG_ERROR_VALUEWRITE_FAILURE;
|
2022-04-22 09:01:01 +00:00
|
|
|
else
|
2010-12-23 17:32:28 +00:00
|
|
|
return JUMPLISTREG_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Adds a new entry to the jumplist entries in the registry. */
|
|
|
|
int add_to_jumplist_registry(const char *item)
|
|
|
|
{
|
|
|
|
return transform_jumplist_registry(item, item, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Removes an item from the jumplist entries in the registry. */
|
|
|
|
int remove_from_jumplist_registry(const char *item)
|
|
|
|
{
|
|
|
|
return transform_jumplist_registry(NULL, item, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Returns the jumplist entries from the registry. Caller must free
|
|
|
|
* the returned pointer. */
|
|
|
|
char *get_jumplist_registry_entries (void)
|
|
|
|
{
|
|
|
|
char *list_value;
|
|
|
|
|
2013-07-22 07:11:58 +00:00
|
|
|
if (transform_jumplist_registry(NULL,NULL,&list_value) != JUMPLISTREG_OK) {
|
2019-09-08 19:29:00 +00:00
|
|
|
list_value = snewn(2, char);
|
2010-12-23 17:32:28 +00:00
|
|
|
*list_value = '\0';
|
|
|
|
*(list_value + 1) = '\0';
|
|
|
|
}
|
|
|
|
return list_value;
|
|
|
|
}
|
|
|
|
|
2000-09-27 15:21:04 +00:00
|
|
|
/*
|
|
|
|
* Recursively delete a registry key and everything under it.
|
|
|
|
*/
|
2001-05-06 14:35:20 +00:00
|
|
|
static void registry_recursive_remove(HKEY key)
|
|
|
|
{
|
2022-04-22 09:01:01 +00:00
|
|
|
char *name;
|
2000-09-27 15:21:04 +00:00
|
|
|
|
2022-04-22 09:01:01 +00:00
|
|
|
DWORD i = 0;
|
|
|
|
while ((name = enum_regkey(key, i)) != NULL) {
|
|
|
|
HKEY subkey = open_regkey(false, key, name);
|
|
|
|
if (subkey) {
|
2019-09-08 19:29:00 +00:00
|
|
|
registry_recursive_remove(subkey);
|
2022-04-22 09:01:01 +00:00
|
|
|
close_regkey(subkey);
|
2019-09-08 19:29:00 +00:00
|
|
|
}
|
2022-04-22 09:01:01 +00:00
|
|
|
del_regkey(key, name);
|
|
|
|
sfree(name);
|
2000-09-27 15:21:04 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-05-06 14:35:20 +00:00
|
|
|
void cleanup_all(void)
|
|
|
|
{
|
2000-09-27 15:21:04 +00:00
|
|
|
/* ------------------------------------------------------------
|
2007-01-09 18:05:17 +00:00
|
|
|
* Wipe out the random seed file, in all of its possible
|
|
|
|
* locations.
|
2000-09-27 15:21:04 +00:00
|
|
|
*/
|
2007-01-09 18:05:17 +00:00
|
|
|
access_random_seed(DEL);
|
2000-09-27 15:21:04 +00:00
|
|
|
|
2010-12-26 20:00:45 +00:00
|
|
|
/* ------------------------------------------------------------
|
|
|
|
* Ask Windows to delete any jump list information associated
|
|
|
|
* with this installation of PuTTY.
|
|
|
|
*/
|
|
|
|
clear_jumplist();
|
|
|
|
|
2000-09-27 15:21:04 +00:00
|
|
|
/* ------------------------------------------------------------
|
|
|
|
* Destroy all registry information associated with PuTTY.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Open the main PuTTY registry key and remove everything in it.
|
|
|
|
*/
|
2022-04-22 09:01:01 +00:00
|
|
|
HKEY key = open_regkey(false, HKEY_CURRENT_USER, PUTTY_REG_POS);
|
|
|
|
if (key) {
|
2019-09-08 19:29:00 +00:00
|
|
|
registry_recursive_remove(key);
|
2022-04-22 09:01:01 +00:00
|
|
|
close_regkey(key);
|
2000-09-27 15:21:04 +00:00
|
|
|
}
|
|
|
|
/*
|
|
|
|
* Now open the parent key and remove the PuTTY main key. Once
|
|
|
|
* we've done that, see if the parent key has any other
|
|
|
|
* children.
|
|
|
|
*/
|
2022-04-22 09:01:01 +00:00
|
|
|
if ((key = open_regkey(false, HKEY_CURRENT_USER,
|
|
|
|
PUTTY_REG_PARENT)) != NULL) {
|
|
|
|
del_regkey(key, PUTTY_REG_PARENT_CHILD);
|
|
|
|
char *name = enum_regkey(key, 0);
|
|
|
|
close_regkey(key);
|
|
|
|
|
2019-09-08 19:29:00 +00:00
|
|
|
/*
|
|
|
|
* If the parent key had no other children, we must delete
|
|
|
|
* it in its turn. That means opening the _grandparent_
|
|
|
|
* key.
|
|
|
|
*/
|
2022-04-22 09:01:01 +00:00
|
|
|
if (name) {
|
|
|
|
sfree(name);
|
|
|
|
} else {
|
|
|
|
if ((key = open_regkey(false, HKEY_CURRENT_USER,
|
|
|
|
PUTTY_REG_GPARENT)) != NULL) {
|
|
|
|
del_regkey(key, PUTTY_REG_GPARENT_CHILD);
|
|
|
|
close_regkey(key);
|
2019-09-08 19:29:00 +00:00
|
|
|
}
|
|
|
|
}
|
2000-09-27 15:21:04 +00:00
|
|
|
}
|
|
|
|
/*
|
|
|
|
* Now we're done.
|
|
|
|
*/
|
|
|
|
}
|