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.

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

Fix version 4.9 log-viewer paths hard coding #1857

Merged
merged 1 commit into from
May 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/Providers/AppServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,11 @@ public function boot()
*/
LogViewer::auth(function ($request) {
// We must disable unsafe-eval because vue3 used by log-viewer requires it.
// We must disable unsafe-inline because log-viewer uses inline script with parameter to boot.
// Those parameters are not know by Lychee if someone modifies the config.
// We only do that in that specific case. It is disabled by default otherwise.
config(['secure-headers.csp.script-src.unsafe-eval' => true]);
config(['secure-headers.csp.script-src.unsafe-inline' => true]);

// Allow to bypass when debug is ON and when env is dev
// At this point, it is no longer our fault if the Lychee admin have their logs publically accessible.
Expand Down
2 changes: 1 addition & 1 deletion config/log-viewer.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
|
*/

'back_to_system_url' => config('app.url', null),
'back_to_system_url' => '../', // config('app.url', null),

'back_to_system_label' => null, // Displayed by default: "Back to {{ app.name }}"

Expand Down
1 change: 0 additions & 1 deletion config/secure-headers.php
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,6 @@
// upload.check()
'CL4mGy9ZhHM+PkLDZsWVuM25kEFBv3FXlmWe/O9Unmc=',

'UGZMnMEgbggabrnTmjaxzU2xHCzzqWszgOgN/xRyKn4=',
/*
document.addEventListener("DOMContentLoaded", function(event) {
document.querySelector("form").addEventListener("submit", function(e){
Expand Down
26 changes: 26 additions & 0 deletions database/migrations/2023_05_19_131139_bump_version040901.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Support\Facades\DB;

return new class() extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up(): void
{
DB::table('configs')->where('key', 'version')->update(['value' => '040901']);
}

/**
* Reverse the migrations.
*
* @return void
*/
public function down(): void
{
DB::table('configs')->where('key', 'version')->update(['value' => '040900']);
}
};
2 changes: 1 addition & 1 deletion version.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.9.0
4.9.1