github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-16 02:02:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove basic auth setting

Browse source
This commit is contained in:
JonnyWong16 2021-07-08 20:22:02 -07:00
parent fe765f7827
commit 2ea4b6b63d
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
3 changed files with 6 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

21
data/interfaces/default/settings.html
View file

@ -664,13 +664,6 @@
<p class="help-block">Password for web server authentication. Leave empty to disable.</p> <p class="help-block">Password for web server authentication. Leave empty to disable.</p>
</div> </div>
<div class="checkbox advanced-setting">
<label>
<input type="checkbox" class="auth-settings" name="http_basic_auth" id="http_basic_auth" value="1" ${config['http_basic_auth']} data-parsley-trigger="change"> Use Basic Authentication
</label>
<p class="help-block">Use basic HTTP authentication instead of the HTML login form.</p>
</div>
<input type="checkbox" name="auth_changed" id="auth_changed" value="1" style="display: none;"> <input type="checkbox" name="auth_changed" id="auth_changed" value="1" style="display: none;">
<div class="checkbox"> <div class="checkbox">
@ -2873,10 +2866,7 @@ $(document).ready(function() {
}); });
function allowPlexAdminCheck () { function allowPlexAdminCheck () {
if ($("#http_basic_auth").is(":checked")) { if ($('#http_username').val() == '' || $('#http_password').val() == '') {
$("#http_plex_admin").attr("checked", false).attr("disabled", true);
$("#allowPlexCheck").html("Plex admin login cannot be enabled with basic authentication.");
} else if ($('#http_username').val() == '' || $('#http_password').val() == '') {
$("#http_plex_admin").attr("checked", false).attr("disabled", true); $("#http_plex_admin").attr("checked", false).attr("disabled", true);
$("#allowPlexCheck").html("You must set an admin username and password above to allow Plex admin login."); $("#allowPlexCheck").html("You must set an admin username and password above to allow Plex admin login.");
} else { } else {
@ -2886,15 +2876,12 @@ $(document).ready(function() {
} }
allowPlexAdminCheck(); allowPlexAdminCheck();
$('#http_username, #http_password, #http_basic_auth').change(function () { $('#http_username, #http_password').change(function () {
allowPlexAdminCheck(); allowPlexAdminCheck();
}); });
function allowGuestAccessCheck () { function allowGuestAccessCheck () {
if ($("#http_basic_auth").is(":checked")) { if ($('#http_username').val() == '' || $('#http_password').val() == '') {
$("#allow_guest_access").attr("checked", false).attr("disabled", true);
$("#allowGuestCheck").html("Guest access cannot be enabled with basic authentication.");
} else if ($('#http_username').val() == '' || $('#http_password').val() == '') {
$("#allow_guest_access").attr("checked", false).attr("disabled", true); $("#allow_guest_access").attr("checked", false).attr("disabled", true);
$("#allowGuestCheck").html("You must set an admin username and password above to allow guest access."); $("#allowGuestCheck").html("You must set an admin username and password above to allow guest access.");
} else { } else {
@ -2905,7 +2892,7 @@ $(document).ready(function() {
} }
allowGuestAccessCheck(); allowGuestAccessCheck();
$('#http_username, #http_password, #http_basic_auth').change(function () { $('#http_username, #http_password').change(function () {
allowGuestAccessCheck(); allowGuestAccessCheck();
}); });

2
plexpy/webauth.py
View file

@ -276,7 +276,7 @@ def check_rate_limit(ip_address):
class AuthController(object): class AuthController(object):
def check_auth_enabled(self): def check_auth_enabled(self):
if not plexpy.CONFIG.HTTP_BASIC_AUTH and plexpy.CONFIG.HTTP_PASSWORD: if plexpy.CONFIG.HTTP_PASSWORD:
return return
raise cherrypy.HTTPRedirect(plexpy.HTTP_ROOT) raise cherrypy.HTTPRedirect(plexpy.HTTP_ROOT)

3
plexpy/webserve.py
View file

@ -3135,7 +3135,6 @@ class WebInterface(object):
config = { config = {
"allow_guest_access": checked(plexpy.CONFIG.ALLOW_GUEST_ACCESS), "allow_guest_access": checked(plexpy.CONFIG.ALLOW_GUEST_ACCESS),
"history_table_activity": checked(plexpy.CONFIG.HISTORY_TABLE_ACTIVITY), "history_table_activity": checked(plexpy.CONFIG.HISTORY_TABLE_ACTIVITY),
"http_basic_auth": checked(plexpy.CONFIG.HTTP_BASIC_AUTH),
"http_host": plexpy.CONFIG.HTTP_HOST, "http_host": plexpy.CONFIG.HTTP_HOST,
"http_username": plexpy.CONFIG.HTTP_USERNAME, "http_username": plexpy.CONFIG.HTTP_USERNAME,
"http_port": plexpy.CONFIG.HTTP_PORT, "http_port": plexpy.CONFIG.HTTP_PORT,
@ -3273,7 +3272,7 @@ class WebInterface(object):
"notify_new_device_initial_only", "notify_new_device_initial_only",
"notify_server_update_repeat", "notify_plexpy_update_repeat", "notify_server_update_repeat", "notify_plexpy_update_repeat",
"monitor_pms_updates", "get_file_sizes", "log_blacklist", "monitor_pms_updates", "get_file_sizes", "log_blacklist",
"allow_guest_access", "cache_images", "http_proxy", "http_basic_auth", "notify_concurrent_by_ip", "allow_guest_access", "cache_images", "http_proxy", "notify_concurrent_by_ip",
"history_table_activity", "plexpy_auto_update", "history_table_activity", "plexpy_auto_update",
"themoviedb_lookup", "tvmaze_lookup", "musicbrainz_lookup", "http_plex_admin", "themoviedb_lookup", "tvmaze_lookup", "musicbrainz_lookup", "http_plex_admin",
"newsletter_self_hosted", "newsletter_inline_styles", "sys_tray_icon" "newsletter_self_hosted", "newsletter_inline_styles", "sys_tray_icon"