Change: move sensitive information to secrets.cfg and private information to private.cfg
We often ask people for their openttd.cfg, which now includes their passwords, usernames, etc. It is easy for people to overlook this, unwillingly sharing information they shouldn't. By splitting this information over either private.cfg or secrets.cfg, we make it more obvious they shouldn't be sharing those files, and hint to what is inside them.pull/332/head
parent
4f3bf84af4
commit
75b6051b7a
@ -0,0 +1,68 @@
|
||||
; This file is part of OpenTTD.
|
||||
; OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
|
||||
; OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
; See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
|
||||
;
|
||||
|
||||
; Network settings as stored in the private configuration file ("private.cfg").
|
||||
|
||||
[pre-amble]
|
||||
static const SettingVariant _network_private_settings[] = {
|
||||
[post-amble]
|
||||
};
|
||||
[templates]
|
||||
SDTC_SSTR = SDTC_SSTR( $var, $type, $flags, $def, $length, $pre_cb, $post_cb, $from, $to, $cat, $extra, $startup),
|
||||
|
||||
[validation]
|
||||
|
||||
[defaults]
|
||||
flags = SF_NONE
|
||||
interval = 0
|
||||
str = STR_NULL
|
||||
strhelp = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
|
||||
strval = STR_NULL
|
||||
pre_cb = nullptr
|
||||
post_cb = nullptr
|
||||
load = nullptr
|
||||
from = SL_MIN_VERSION
|
||||
to = SL_MAX_VERSION
|
||||
cat = SC_ADVANCED
|
||||
extra = 0
|
||||
startup = false
|
||||
|
||||
|
||||
|
||||
[SDTC_SSTR]
|
||||
var = network.client_name
|
||||
type = SLE_STR
|
||||
length = NETWORK_CLIENT_NAME_LENGTH
|
||||
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
|
||||
def = nullptr
|
||||
pre_cb = NetworkValidateClientName
|
||||
post_cb = NetworkUpdateClientName
|
||||
cat = SC_BASIC
|
||||
|
||||
[SDTC_SSTR]
|
||||
var = network.server_name
|
||||
type = SLE_STR
|
||||
length = NETWORK_NAME_LENGTH
|
||||
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_NETWORK_ONLY
|
||||
def = nullptr
|
||||
pre_cb = NetworkValidateServerName
|
||||
post_cb = [](auto) { UpdateClientConfigValues(); }
|
||||
cat = SC_BASIC
|
||||
|
||||
[SDTC_SSTR]
|
||||
var = network.connect_to_ip
|
||||
type = SLE_STR
|
||||
length = 0
|
||||
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
|
||||
def = nullptr
|
||||
|
||||
[SDTC_SSTR]
|
||||
var = network.last_joined
|
||||
type = SLE_STR
|
||||
length = 0
|
||||
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
|
||||
def = """"
|
||||
cat = SC_EXPERT
|
@ -0,0 +1,76 @@
|
||||
; This file is part of OpenTTD.
|
||||
; OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
|
||||
; OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
; See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
|
||||
;
|
||||
|
||||
; Network settings as stored in the secrets configuration file ("secrets.cfg").
|
||||
|
||||
[pre-amble]
|
||||
static bool ReplaceAsteriskWithEmptyPassword(std::string &newval);
|
||||
|
||||
static const SettingVariant _network_secrets_settings[] = {
|
||||
[post-amble]
|
||||
};
|
||||
[templates]
|
||||
SDTC_SSTR = SDTC_SSTR( $var, $type, $flags, $def, $length, $pre_cb, $post_cb, $from, $to, $cat, $extra, $startup),
|
||||
|
||||
[validation]
|
||||
|
||||
[defaults]
|
||||
flags = SF_NONE
|
||||
interval = 0
|
||||
str = STR_NULL
|
||||
strhelp = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
|
||||
strval = STR_NULL
|
||||
pre_cb = nullptr
|
||||
post_cb = nullptr
|
||||
load = nullptr
|
||||
from = SL_MIN_VERSION
|
||||
to = SL_MAX_VERSION
|
||||
cat = SC_ADVANCED
|
||||
extra = 0
|
||||
startup = false
|
||||
|
||||
|
||||
|
||||
[SDTC_SSTR]
|
||||
var = network.server_password
|
||||
type = SLE_STR
|
||||
length = NETWORK_PASSWORD_LENGTH
|
||||
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_NETWORK_ONLY
|
||||
def = nullptr
|
||||
pre_cb = ReplaceAsteriskWithEmptyPassword
|
||||
post_cb = [](auto) { NetworkServerUpdateGameInfo(); }
|
||||
cat = SC_BASIC
|
||||
|
||||
[SDTC_SSTR]
|
||||
var = network.rcon_password
|
||||
type = SLE_STR
|
||||
length = NETWORK_PASSWORD_LENGTH
|
||||
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_NETWORK_ONLY
|
||||
def = nullptr
|
||||
pre_cb = ReplaceAsteriskWithEmptyPassword
|
||||
cat = SC_BASIC
|
||||
|
||||
[SDTC_SSTR]
|
||||
var = network.admin_password
|
||||
type = SLE_STR
|
||||
length = NETWORK_PASSWORD_LENGTH
|
||||
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_NETWORK_ONLY
|
||||
def = nullptr
|
||||
cat = SC_BASIC
|
||||
|
||||
[SDTC_SSTR]
|
||||
var = network.default_company_pass
|
||||
type = SLE_STR
|
||||
length = NETWORK_PASSWORD_LENGTH
|
||||
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
|
||||
def = nullptr
|
||||
|
||||
[SDTC_SSTR]
|
||||
var = network.network_id
|
||||
type = SLE_STR
|
||||
length = NETWORK_SERVER_ID_LENGTH
|
||||
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_NETWORK_ONLY
|
||||
def = nullptr
|
Loading…
Reference in New Issue