Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bookworm Web Interface 403 #2128

Merged
merged 4 commits into from
Dec 2, 2023
Merged

Bookworm Web Interface 403 #2128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fd28a37
make homedir executable for lighttp
AlvinSchiller Nov 27, 2023
12293d9
fix deprecations lighttp
AlvinSchiller Nov 27, 2023
5adf7c0
removed faulty code (error in php 8.x)
AlvinSchiller Dec 1, 2023
b24a4f0
automatic editorconfig changes (whitespaces)
AlvinSchiller Dec 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 22 additions & 29 deletions htdocs/manageFilesFolders.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@
*/
if ($_POST['ACTION'] == "fileUpload") {
/*
* I spent 3 hours trying to find out why when I upload multiples file $_FILES return empty,
* I did noticed it was only when I select files that exceed 3m so I thought it was something
* related to the MAX_UPLOAD_SIZE that for my surprice came as default as 20m which was very
* confusing. Later I discovery the problem was in the POST_MAX_SIZE been 3m, so it happen
* that not only MAX_UPLOAD_SIZE is responsible and that is why I'd like to know there is no
* I spent 3 hours trying to find out why when I upload multiples file $_FILES return empty,
* I did noticed it was only when I select files that exceed 3m so I thought it was something
* related to the MAX_UPLOAD_SIZE that for my surprice came as default as 20m which was very
* confusing. Later I discovery the problem was in the POST_MAX_SIZE been 3m, so it happen
* that not only MAX_UPLOAD_SIZE is responsible and that is why I'd like to know there is no
* error message that shows the cause.
*/
*/

$uFiles = getFiles();
//print "<pre>"; print_r($uFiles); print "</pre>"; //???
// are there any files?
Expand All @@ -82,7 +82,7 @@
if (count($uFiles['ufile']) == 0) {
// if 0 there are no files
$messageWarning .= "<p>No files were uploaded.</p>";
}
}
/*
* let's start building the path to move the files to
* as a relative path.
Expand Down Expand Up @@ -112,7 +112,7 @@
if(!file_exists($Audio_Folders_Path . "/" . $moveFolder)) {
// no, so create the folder
$exec = 'mkdir "' . $moveFolder . '"; chown -R pi:www-data "' . $moveFolder . '"; sudo chmod -R 777 "' . $moveFolder . '"';
exec($exec);
exec($exec);
$messageAction .= "Will create new folder and move files to: '" . $moveFolder . "'";
} else {
// folder exists already :(
Expand All @@ -126,7 +126,7 @@
if(realpath($moveFolder) == realpath($Audio_Folders_Path)) {
$messageWarning .= $lang['manageFilesFoldersErrorNoNewFolder'];
}

// if no error message
if ($messageWarning == "") {
// move files to folder
Expand Down Expand Up @@ -161,12 +161,12 @@
if($messageWarning == "") {
/*
* create folder
*/
*/
$exec = 'mkdir "'.$Audio_Folders_Path.'/'.$newDirPathRel.'"; sudo chmod -R 777 "'.$Audio_Folders_Path.'/'.$newDirPathRel.'"; chown -R pi:www-data "' . $Audio_Folders_Path.'/'.$newDirPathRel . '"';
exec($exec);
$messageSuccess = "<p>".$lang['manageFilesFoldersSuccessNewFolder']." '".$newDirPathRel."'</p>";


}
}

Expand Down Expand Up @@ -278,13 +278,6 @@
}
}

// check if we can preselect an audiofolder if NOT a foldername was posted
if (!isset($fpost['folder'])) {
if (array_key_exists($fpost['cardID'], $shortcuts)) {
$fpost['folder'] = $shortcuts[$fpost['cardID']];
}
}

// go through all folders
foreach ($audiofolders as $keyfolder => $audiofolder) {

Expand Down Expand Up @@ -340,19 +333,19 @@ class="form-control input-md" type="text">
<!--input type="hidden" name="filename" value="<?php print $post['filename']; ?>"-->
<input type="hidden" name="ACTION" value="folderCreateNew">

<fieldset>
<fieldset>
<!-- Form Name -->
<legend><i class='mdi mdi-folder-plus'></i> <?php print $lang['manageFilesFoldersNewFolderTitle']; ?></legend>

<!-- Text input-->
<div class="form-group">
<label class="col-md-3 control-label" for="folderCreateNew"><?php print $lang['globalFolderName']; ?></label>
<label class="col-md-3 control-label" for="folderCreateNew"><?php print $lang['globalFolderName']; ?></label>
<div class="col-md-7">
<input value="" id="folderCreateNew" name="folderCreateNew" placeholder="<?php print $lang['cardFormYTFolderPlaceholder']; ?>" class="form-control input-md" type="text">
<span class="help-block"><?php print $lang['folderCreateNew']; ?></span>
<span class="help-block"><?php print $lang['folderCreateNew']; ?></span>
</div>
</div>

<!-- Select Basic -->
<div class="form-group">
<label class="col-md-3 control-label" for="folderParent"><?php print $lang['manageFilesFoldersNewFolderPositionLegend']; ?></label>
Expand All @@ -368,16 +361,16 @@ class="form-control input-md" type="text">
print " selected=selected";
}
print ">".$audiofolder."</option>\n";

}
?>
</select>
<span class="help-block"></span>
<span class="help-block"></span>
</div>
</div>

</fieldset>

<!-- Button (Double) -->
<div class="form-group">
<label class="col-md-3 control-label" for="submit"></label>
Expand Down
6 changes: 3 additions & 3 deletions misc/sampleconfigs/lighttpd.conf.buster-default.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ index-file.names = ( "index.php", "index.html" )
url.access-deny = ( "~", ".inc" )
static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )

compress.cache-dir = "/var/cache/lighttpd/compress/"
compress.filetype = ( "application/javascript", "text/css", "text/html", "text/plain" )
deflate.cache-dir = "/var/cache/lighttpd/compress/"
deflate.mimetypes = ( "application/javascript", "text/css", "text/html", "text/plain" )

# default listening port for IPv6 falls back to the IPv4 port
include_shell "/usr/share/lighttpd/use-ipv6.pl " + server.port
Expand All @@ -45,7 +45,7 @@ include "/etc/lighttpd/conf-enabled/*.conf"

#server.compat-module-load = "disable"
server.modules += (
"mod_compress",
s-martin marked this conversation as resolved.
Show resolved Hide resolved
"mod_deflate",
"mod_dirlisting",
"mod_staticfile",
)
2 changes: 2 additions & 0 deletions scripts/installscripts/install-jukebox.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,6 +826,8 @@ web_server_config() {
local sudoers="/etc/sudoers"

echo "Configuring web server..."
# make sure lighttp can access the home directory of the user
sudo chmod o+x ${HOME_DIR}
# Web server configuration settings
# -rw-r--r-- 1 root root 1040 Apr 30 09:19 /etc/lighttpd/lighttpd.conf
sudo cp "${jukebox_dir}"/misc/sampleconfigs/lighttpd.conf.buster-default.sample "${lighthttpd_conf}"
Expand Down
Loading