colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: support qualifying proxy.pac-script with "file://" or "js://"

Browse Source
This commit is contained in:
Thomas Haller
2016-09-27 11:20:11 +02:00
parent 2de000e1d2
commit 132234bb79
2 changed files with 62 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
clients/cli/common.c
View File

@@ -913,33 +913,65 @@ nmc_team_check_config (const char *config, char **out_config, GError **error)
gboolean gboolean
nmc_proxy_check_script (const char *script, char **out_script, GError **error) nmc_proxy_check_script (const char *script, char **out_script, GError **error)
{ {
char *contents = NULL; enum {
_PAC_SCRIPT_TYPE_GUESS,
_PAC_SCRIPT_TYPE_FILE,
_PAC_SCRIPT_TYPE_JSON,
} desired_type = _PAC_SCRIPT_TYPE_GUESS;
const char *filename = NULL;
size_t c_len = 0; size_t c_len = 0;
gs_free char *script_clone = NULL;
*out_script = NULL; *out_script = NULL;
if (!script || strlen (script) == strspn (script, " \t")) if (!script || !script[0])
return TRUE; return TRUE;
/* 'script' can be either a file name or raw PAC Script data */ if (g_str_has_prefix (script, "file://")) {
if (g_file_test (script, G_FILE_TEST_EXISTS)) script += NM_STRLEN ("file://");
(void) g_file_get_contents (script, &contents, NULL, NULL); desired_type = _PAC_SCRIPT_TYPE_FILE;
else } else if (g_str_has_prefix (script, "js://")) {
contents = g_strdup (script); script += NM_STRLEN ("js://");
desired_type = _PAC_SCRIPT_TYPE_JSON;
if (contents) {
g_strstrip (contents);
c_len = strlen (contents);
} }
/* Do a simple validity check */ if (NM_IN_SET (desired_type, _PAC_SCRIPT_TYPE_FILE, _PAC_SCRIPT_TYPE_GUESS)) {
if (!contents || !contents[0] || c_len > 100000 || !strstr (contents, "FindProxyForURL")) { gs_free char *contents = NULL;
g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT,
_("'%s' is not a valid PAC Script or file name."), script); if (!g_file_get_contents (script, &contents, &c_len, NULL)) {
g_free (contents); if (desired_type == _PAC_SCRIPT_TYPE_FILE) {
g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT,
_("cannot read pac-script from file '%s'"),
script);
return FALSE;
}
} else {
if (c_len != strlen (contents)) {
g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT,
_("file '%s' contains non-valid utf-8"),
script);
return FALSE;
}
filename = script;
script = script_clone = g_steal_pointer (&contents);
}
}
if ( !strstr (script, "FindProxyForURL")
|| !g_utf8_validate (script, -1, NULL)) {
if (filename) {
g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT,
_("'%s' does not contain a valid PAC Script"), filename);
} else {
g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT,
_("Not a valid PAC Script"));
}
return FALSE; return FALSE;
} }
*out_script = g_strdelimit (contents, "\t\r\n", ' ');
*out_script = (script == script_clone)
? g_steal_pointer (&script_clone)
: g_strdup (script);
return TRUE; return TRUE;
} }

13
man/nmcli.xml
View File

@@ -1983,6 +1983,19 @@ It's equivalent of using <literal>+ipv6.addresses</literal> syntax.</entry>
</tbody> </tbody>
</tgroup></table> </tgroup></table>
<table><title>Proxy options</title><tgroup cols="3">
<thead>
<row><entry>Alias</entry><entry>Property</entry><entry>Note</entry></row>
</thead>
<tbody>
<row>
<entry align="left"></entry>
<entry align="left"><link linkend="nm-settings.property.proxy.pac-script">proxy.pac-script</link></entry>
<entry align="left" valign="top">Read the java script pac-script from file or pass it directly on the command line. Prefix the value with "file://" or "js://" to force one or the other.</entry>
</row>
</tbody>
</tgroup></table>
</refsect1> </refsect1>
<refsect1 id='environment_variables'><title>Environment Variables</title> <refsect1 id='environment_variables'><title>Environment Variables</title>