1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
|
--- gsa-7.0.3/src/gsad_omp.c 2019-02-02 03:22:19.297954361 +0300
+++ gsa-7.0.3/src/gsad_omp.c 2019-02-02 03:27:57.690214371 +0300
@@ -1366,7 +1366,8 @@
|| (strstr (param_name, "_id")
== param_name + strlen (param_name) - strlen ("_id"))
|| (strcmp (param_name, "name") == 0
- && strcasecmp (prev_action, "Run Wizard") == 0)
+ && (strcasecmp (prev_action, "Run Wizard") == 0
+ || strcasecmp (next_cmd, "auth_settings") == 0))
|| (strcmp (param_name, "get_name") == 0
&& strcasecmp (next_cmd, "wizard_get") == 0))
{
@@ -25984,7 +25976,7 @@
html = response_from_entity (connection, credentials, params, entity,
(no_redirect && strcmp (no_redirect, "0")),
- NULL, NULL,
+ NULL, "auth_settings",
NULL, "modify_auth",
"Save Authentication Configuration",
response_data);
--- gsa-7.0.3/src/html/classic/js/greenbone.js 2018-03-28 16:23:57.000000000 +0300
+++ gsa-7.0.3/src/html/classic/js/greenbone.js 2019-02-02 03:40:37.162714538 +0300
@@ -1559,6 +1559,9 @@
if (reload === 'next') {
reload_next(response);
}
+ else if (reload === 'window') {
+ location.reload();
+ }
},
function(jqXHR) {
if (jqXHR.status == 0 && jqXHR.readyState == 0) {
--- gsa-7.0.3/src/html/classic/omp.xsl 2018-03-28 16:23:57.000000000 +0300
+++ gsa-7.0.3/src/html/classic/omp.xsl 2019-02-02 03:44:28.470599715 +0300
@@ -36775,7 +36822,8 @@
<!-- AUTHENTICATION DESCRIPTION -->
<xsl:template match="group" mode="ldapauth">
- <div class="section-box" id="ldap-box">
+ <div class="section-box ajax-post" id="ldap-box"
+ data-button="form #save_button" data-reload="window">
<form action="/omp" method="post" enctype="multipart/form-data">
<input type="hidden" name="token" value="{/envelope/token}"/>
<input type="hidden" name="cmd" value="save_auth"/>
@@ -36784,6 +36832,15 @@
<input type="hidden" name="filter" value="{gsa:envelope-filter ()}"/>
<!-- group name is e.g. of method:ldap -->
<input type="hidden" name="group" value="{@name}"/>
+ <!-- Auth type name for next page -->
+ <input type="hidden" name="name" value="ldap"/>
+
+ <div class="error-dialog">
+ <div class="text-center">
+ <xsl:value-of select="gsa:i18n ('LDAP authentication config could not be modified.')"/>
+ </div>
+ </div>
+
<table class="gbntable">
<tr class="gbntablehead2">
<td><xsl:value-of select="gsa:i18n ('Setting')"/></td>
@@ -36838,7 +36895,8 @@
</tr>
<tr>
<td colspan="2" style="text-align:right;">
- <input type="submit" name="submit" value="{gsa:i18n ('Save')}"/>
+ <input type="submit" name="submit" id="save_button"
+ value="{gsa:i18n ('Save')}"/>
</td>
</tr>
</table>
@@ -36847,7 +36905,8 @@
</xsl:template>
<xsl:template match="group" mode="radiusauth">
- <div class="section-box" id="radius-box">
+ <div class="section-box ajax-post" id="radius-box"
+ data-button="form #save_button" data-reload="window">
<form action="/omp" method="post" enctype="multipart/form-data">
<input type="hidden" name="token" value="{/envelope/token}"/>
<input type="hidden" name="cmd" value="save_auth"/>
@@ -36856,6 +36915,15 @@
<input type="hidden" name="filter" value="{gsa:envelope-filter ()}"/>
<!-- group name is e.g. of method:radius_connect -->
<input type="hidden" name="group" value="{@name}"/>
+ <!-- Auth type name for next page -->
+ <input type="hidden" name="name" value="radius"/>
+
+ <div class="error-dialog">
+ <div class="text-center">
+ <xsl:value-of select="gsa:i18n ('Radius authentication config could not be modified.')"/>
+ </div>
+ </div>
+
<table class="gbntable">
<tr class="gbntablehead2">
<td><xsl:value-of select="gsa:i18n ('Setting')"/></td>
@@ -36890,7 +36958,8 @@
</tr>
<tr>
<td colspan="2" style="text-align:right;">
- <input type="submit" name="submit" value="{gsa:i18n ('Save')}"/>
+ <input type="submit" name="submit" id="save_button"
+ value="{gsa:i18n ('Save')}"/>
</td>
</tr>
</table>
|
GitWeb