external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3919 from avni/u2u25

Browse source 
upload2usb: moving app out of local_content, relaxing mime type requirements, link swing back to homepage
This commit is contained in:
A Holt 2025-01-26 22:09:59 -05:00 • committed by GitHub
commit e57ea34590
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
roles/nginx/templates/iiab.conf.j2
View file

@ -5,11 +5,11 @@ location / {
location /usb { location /usb {
alias /library/www/html/local_content/; alias /library/www/html/local_content/;
fancyindex on; # autoindex on; fancyindex on; # autoindex on;
add_before_body /usb/upload/button.html; add_before_body /upload2usb/button.html;
} }
location ~ ^/usb/upload/(.*)\.php$ { location ~ ^/upload2usb/(.*)\.php$ {
alias /library/www/html/local_content/upload/$1.php; alias /library/www/html/upload2usb/$1.php;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header Host $host; proxy_set_header Host $host;
@ -23,7 +23,7 @@ location ~ ^/usb/upload/(.*)\.php$ {
location /local_content/ { location /local_content/ {
fancyindex on; # autoindex on; fancyindex on; # autoindex on;
add_before_body /usb/upload/button.html; add_before_body /upload2usb/button.html;
} }
location /info { location /info {

2
roles/usb_lib/files/upload/button.html
View file

@ -16,4 +16,4 @@
color: #ddd; color: #ddd;
} }
</style> </style>
<a class="button" href="/usb/upload/">Upload to USB</a> <a class="button" href="/upload2usb/">Upload to USB</a>

2
roles/usb_lib/files/upload/header.php
View file

@ -28,5 +28,5 @@ include("upload2usb.php");
<div class="row"> <div class="row">
<div class="col-sm-6 offset-sm-3 text-center" style="padding:15px;"> <div class="col-sm-6 offset-sm-3 text-center" style="padding:15px;">
<img class="mb-4" src="uk-swing.png" alt="" width="75"> <a href="/upload2usb/"><img class="mb-4" src="uk-swing.png" alt="" width="75"></a>
<h1 class="h3 mb-3 font-weight-normal"><?php echo $title ?></h1> <h1 class="h3 mb-3 font-weight-normal"><?php echo $title ?></h1>

2
roles/usb_lib/files/upload/upload2usb.php
View file

@ -55,7 +55,7 @@ function getFileCount ($folder_path) {
//check if file mimetype is acceptable for upload //check if file mimetype is acceptable for upload
function isFileMimeTypeAcceptable ($file) { function isFileMimeTypeAcceptable ($file) {
$mimetype = strtolower(mime_content_type($file)); $mimetype = strtolower(mime_content_type($file));
$invalid_mimetypes_str = array ("compress", "image/svg+xml", "octet", "text/xml", "xhtml+xml", "zip"); $invalid_mimetypes_str = array ("compress", "image/svg+xml", "octet", "text/xml", "xhtml+xml");
foreach ($invalid_mimetypes_str as $invalid_mt_str) { foreach ($invalid_mimetypes_str as $invalid_mt_str) {
if (str_contains($mimetype, $invalid_mt_str)) { if (str_contains($mimetype, $invalid_mt_str)) {
error_log('UPLOAD2USB ERROR - MIMETYPE: ' . $mimetype); error_log('UPLOAD2USB ERROR - MIMETYPE: ' . $mimetype);

8
roles/usb_lib/tasks/install.yml
View file

@ -79,18 +79,18 @@
- { src: 'iiab-usb_lib-show-all-off', dest: '/usr/bin/', mode: '0755' } - { src: 'iiab-usb_lib-show-all-off', dest: '/usr/bin/', mode: '0755' }
- { src: 'iiab-clean-usb.sh', dest: '/usr/sbin/', mode: '0755' } - { src: 'iiab-clean-usb.sh', dest: '/usr/sbin/', mode: '0755' }
- name: '2025-01-05: Add upload2usb app (#3875) directory to local_content' - name: '2025-01-05: Add upload2usb app (#3875) directory to doc_root'
file: file:
state: directory state: directory
path: "{{ doc_root }}/local_content/upload" path: "{{ doc_root }}/upload2usb"
owner: "{{ apache_user }}" owner: "{{ apache_user }}"
group: "{{ apache_user }}" group: "{{ apache_user }}"
mode: 0755 mode: 0755
- name: '2025-01-05: Copy upload2usb app (#3875) files from files/upload/ to local_content' - name: '2025-01-05: Copy upload2usb app (#3875) files from files/upload/ to upload2usb'
copy: copy:
src: "{{ item }}" src: "{{ item }}"
dest: "{{ doc_root }}/local_content/upload" # /library/www/html dest: "{{ doc_root }}/upload2usb" # /library/www/html
with_fileglob: with_fileglob:
- upload/* - upload/*