Skip to content

Commit 2e325a7

Browse files
committed
Add viewing user and update MHD authentication functions
1 parent ce95ce2 commit 2e325a7

7 files changed

Lines changed: 235 additions & 328 deletions

File tree

doc/motion_config.html

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -448,22 +448,26 @@ <h2><a name="Configuration_OptionsTopic"></a> Configuration Options-Listed by T
448448
<tr>
449449
<td bgcolor="#edf4f9" ><a href="#webcontrol_interface" >webcontrol_interface</a> </td>
450450
<td bgcolor="#edf4f9" ><a href="#webcontrol_auth_method" >webcontrol_auth_method</a> </td>
451-
<td bgcolor="#edf4f9" ><a href="#webcontrol_authentication" >webcontrol_authentication</a> </td>
452-
<td bgcolor="#edf4f9" ><a href="#webcontrol_tls" >webcontrol_tls</a> </td>
451+
<td bgcolor="#edf4f9" ><a href="#webcontrol_auth_admin" >webcontrol_auth_admin</a> </td>
452+
<td bgcolor="#edf4f9" ><a href="#webcontrol_auth_user" >webcontrol_auth_user</a> </td>
453+
453454
</tr>
454455
<tr>
456+
<td bgcolor="#edf4f9" ><a href="#webcontrol_tls" >webcontrol_tls</a> </td>
455457
<td bgcolor="#edf4f9" ><a href="#webcontrol_cert" >webcontrol_cert</a> </td>
456458
<td bgcolor="#edf4f9" ><a href="#webcontrol_key" >webcontrol_key</a> </td>
457459
<td bgcolor="#edf4f9" ><a href="#webcontrol_headers" >webcontrol_headers</a> </td>
458-
<td bgcolor="#edf4f9" ><a href="#webcontrol_actions" >webcontrol_actions</a> </td>
460+
459461
</tr>
460462
<tr>
463+
<td bgcolor="#edf4f9" ><a href="#webcontrol_actions" >webcontrol_actions</a> </td>
461464
<td bgcolor="#edf4f9" ><a href="#webcontrol_html" >webcontrol_html</a> </td>
462465
<td bgcolor="#edf4f9" ><a href="#webcontrol_base_path" >webcontrol_base_path</a> </td>
463466
<td bgcolor="#edf4f9" ><a href="#webcontrol_lock_attempts" >webcontrol_lock_attempts</a> </td>
464-
<td bgcolor="#edf4f9" ><a href="#webcontrol_lock_minutes" >webcontrol_lock_minutes</a> </td>
467+
465468
</tr>
466469
<tr>
470+
<td bgcolor="#edf4f9" ><a href="#webcontrol_lock_minutes" >webcontrol_lock_minutes</a> </td>
467471
<td bgcolor="#edf4f9" ><a href="#webcontrol_lock_script" >webcontrol_lock_script</a> </td>
468472
</tr>
469473
</tbody>
@@ -2358,7 +2362,7 @@ <h3><a name="OptDetail_Webcontrol"></a>Web Control</a> </h3>
23582362
webcontrol parameters differ between camera files, Motion will only
23592363
select one of those sets to use for that port. For example, if
23602364
camera1.conf and camera2.conf both specify webcontrol_port 8081 but
2361-
camera1.conf and camera2.conf have different webcontrol_authentication
2365+
camera1.conf and camera2.conf have different webcontrol_auth_user
23622366
parameters, then Motion will only use EITHER the one in camera1.conf
23632367
OR the one in camera2.conf. Which one it uses is random.
23642368
<ul>
@@ -2425,10 +2429,20 @@ <h3><a name="webcontrol_auth_method"></a> webcontrol_auth_method </h3>
24252429
</ul>
24262430
<p></p>
24272431

2428-
<h3><a name="webcontrol_authentication"></a> webcontrol_authentication </h3>
2432+
<h3><a name="webcontrol_auth_admin"></a> webcontrol_auth_admin </h3>
2433+
<ul>
2434+
<li> Values: String | Default: Not defined</li>
2435+
The admin username and password specified as username:password
2436+
This user has all the permissions granted by the webcontrol_parms
2437+
and webcontrol_actions.
2438+
</ul>
2439+
<p></p>
2440+
2441+
<h3><a name="webcontrol_auth_user"></a> webcontrol_auth_user </h3>
24292442
<ul>
24302443
<li> Values: String | Default: Not defined</li>
2431-
The username and password specified as username:password
2444+
The user username and password specified as username:password.
2445+
This user has only read/view permissions on the webcontrol
24322446
</ul>
24332447
<p></p>
24342448

0 commit comments

Comments
 (0)