Page MenuHomePhorge
Differential D3167

Content Security Policy headers
ClosedPublic
Actions

Authored by machniak on Dec 31 2021, 12:34 PM.

Details

Reviewers
vanmeeuwen
Group Reviewers
Restricted Project
Commits
rKa3b60651125a: Content Security Policy headers
Summary

Fixed unrelated js error

Test Plan

./phpunit

Diff Detail

Repository
rK kolab
Branch
dev/security-headers
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 37571
Build 15107: arc lint + arc unit

Event Timeline

machniak requested review of this revision.Dec 31 2021, 12:34 PM
machniak created this revision.
Harbormaster completed remote builds in B37571: Diff 9053.Dec 31 2021, 12:34 PM
vanmeeuwen accepted this revision.Dec 31 2021, 12:42 PM
This revision is now accepted and ready to land.Dec 31 2021, 12:42 PM
Closed by commit rKa3b60651125a: Content Security Policy headers. · Explain WhyDec 31 2021, 12:44 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
src/
3 lines
app/
Http/
2 lines
Middleware/
34 lines
config/
5 lines
resources/
js/
2 lines

Diff 9053

View Options

src/.env.example

Show First 20 Lines • Show All 1,963 Lines • ▼ Show 20 Lines protected function relations_state_get($device_key, $folderid, $synctime)
0, 0,
1, 1,
$device_key, $device_key,
$folderid, $folderid,
$synctime $synctime
); );
if ($row = $db->fetch_assoc()) { if ($row = $db->fetch_assoc()) {
// MariaDB's datetime output includes microseconds, we need to remove them, // Don't use $row['synctime'] for the internal cache.
// it must be "Y-m-d H:i:s" format // The synctime of the found row is usually earlier than the requested synctime.
$synctime = preg_replace('/\.[0-9]+/', '', $row['synctime']); // Note: We use internal cache because there's a call to both hasChanges() and
// getChangedEntries() in Sync. It's needed until we add some caching on a higher level.
$this->relations[$folderid][$synctime] = json_decode($row['data'], true); $this->relations[$folderid][$synctime] = json_decode($row['data'], true);
}
mollekopfUnsubmitted
Done
Inline Actions

This copies the latest database entry into the current $synctime cache, so that seems to indeed make more sense than reusing the synctime of the previous database entry.

mollekopf: This copies the latest database entry into the current $synctime cache, so that seems to indeed…
// Cleanup: remove all records except the current one // Cleanup: remove all records except the current one
$db->query( $db->query(
"DELETE FROM `syncroton_relations_state`" "DELETE FROM `syncroton_relations_state`"
. " WHERE `device_id` = ? AND `folder_id` = ? AND `synctime` <> ?", . " WHERE `device_id` = ? AND `folder_id` = ? AND `synctime` <> ?",
$device_key, $device_key,
$folderid, $folderid,
$synctime $row['synctime'],
mollekopfUnsubmitted
Not Done
Inline Actions

But this is supposed to remove all cache entries except the current one which identified by $synctime, so if $synctime and $row['synctime'] are different we would remove the current cache entry and instead leave the previous one, no? It may not matter because we just always get the latest.

mollekopf: But this is supposed to remove all cache entries except the current one which identified by…
mollekopfUnsubmitted
Not Done
Inline Actions

nevermind, "current" is not the new entry, but the one that latest that exists.

mollekopf: nevermind, "current" is not the new entry, but the one that latest that exists.
); );
} }
}
return $this->relations[$folderid][$synctime] ?? null; return $this->relations[$folderid][$synctime] ?? null;
} }
/** /**
* Return last storage error * Return last storage error
*/ */
public static function last_error() public static function last_error()
Show All 34 Lines
View Options

src/app/Http/Kernel.php

Show First 20 Lines • Show All 1,963 Lines • ▼ Show 20 Lines protected function relations_state_get($device_key, $folderid, $synctime)
0, 0,
1, 1,
$device_key, $device_key,
$folderid, $folderid,
$synctime $synctime
); );
if ($row = $db->fetch_assoc()) { if ($row = $db->fetch_assoc()) {
// MariaDB's datetime output includes microseconds, we need to remove them, // Don't use $row['synctime'] for the internal cache.
// it must be "Y-m-d H:i:s" format // The synctime of the found row is usually earlier than the requested synctime.
$synctime = preg_replace('/\.[0-9]+/', '', $row['synctime']); // Note: We use internal cache because there's a call to both hasChanges() and
// getChangedEntries() in Sync. It's needed until we add some caching on a higher level.
$this->relations[$folderid][$synctime] = json_decode($row['data'], true); $this->relations[$folderid][$synctime] = json_decode($row['data'], true);
}
mollekopfUnsubmitted
Done
Inline Actions

This copies the latest database entry into the current $synctime cache, so that seems to indeed make more sense than reusing the synctime of the previous database entry.

mollekopf: This copies the latest database entry into the current $synctime cache, so that seems to indeed…
// Cleanup: remove all records except the current one // Cleanup: remove all records except the current one
$db->query( $db->query(
"DELETE FROM `syncroton_relations_state`" "DELETE FROM `syncroton_relations_state`"
. " WHERE `device_id` = ? AND `folder_id` = ? AND `synctime` <> ?", . " WHERE `device_id` = ? AND `folder_id` = ? AND `synctime` <> ?",
$device_key, $device_key,
$folderid, $folderid,
$synctime $row['synctime'],
mollekopfUnsubmitted
Not Done
Inline Actions

But this is supposed to remove all cache entries except the current one which identified by $synctime, so if $synctime and $row['synctime'] are different we would remove the current cache entry and instead leave the previous one, no? It may not matter because we just always get the latest.

mollekopf: But this is supposed to remove all cache entries except the current one which identified by…
mollekopfUnsubmitted
Not Done
Inline Actions

nevermind, "current" is not the new entry, but the one that latest that exists.

mollekopf: nevermind, "current" is not the new entry, but the one that latest that exists.
); );
} }
}
return $this->relations[$folderid][$synctime] ?? null; return $this->relations[$folderid][$synctime] ?? null;
} }
/** /**
* Return last storage error * Return last storage error
*/ */
public static function last_error() public static function last_error()
Show All 34 Lines
View Options

src/app/Http/Middleware/ContentSecurityPolicy.php

Show First 20 Lines • Show All 1,963 Lines • ▼ Show 20 Lines protected function relations_state_get($device_key, $folderid, $synctime)
0, 0,
1, 1,
$device_key, $device_key,
$folderid, $folderid,
$synctime $synctime
); );
if ($row = $db->fetch_assoc()) { if ($row = $db->fetch_assoc()) {
// MariaDB's datetime output includes microseconds, we need to remove them, // Don't use $row['synctime'] for the internal cache.
// it must be "Y-m-d H:i:s" format // The synctime of the found row is usually earlier than the requested synctime.
$synctime = preg_replace('/\.[0-9]+/', '', $row['synctime']); // Note: We use internal cache because there's a call to both hasChanges() and
// getChangedEntries() in Sync. It's needed until we add some caching on a higher level.
$this->relations[$folderid][$synctime] = json_decode($row['data'], true); $this->relations[$folderid][$synctime] = json_decode($row['data'], true);
}
mollekopfUnsubmitted
Done
Inline Actions

This copies the latest database entry into the current $synctime cache, so that seems to indeed make more sense than reusing the synctime of the previous database entry.

mollekopf: This copies the latest database entry into the current $synctime cache, so that seems to indeed…
// Cleanup: remove all records except the current one // Cleanup: remove all records except the current one
$db->query( $db->query(
"DELETE FROM `syncroton_relations_state`" "DELETE FROM `syncroton_relations_state`"
. " WHERE `device_id` = ? AND `folder_id` = ? AND `synctime` <> ?", . " WHERE `device_id` = ? AND `folder_id` = ? AND `synctime` <> ?",
$device_key, $device_key,
$folderid, $folderid,
$synctime $row['synctime'],
mollekopfUnsubmitted
Not Done
Inline Actions

But this is supposed to remove all cache entries except the current one which identified by $synctime, so if $synctime and $row['synctime'] are different we would remove the current cache entry and instead leave the previous one, no? It may not matter because we just always get the latest.

mollekopf: But this is supposed to remove all cache entries except the current one which identified by…
mollekopfUnsubmitted
Not Done
Inline Actions

nevermind, "current" is not the new entry, but the one that latest that exists.

mollekopf: nevermind, "current" is not the new entry, but the one that latest that exists.
); );
} }
}
return $this->relations[$folderid][$synctime] ?? null; return $this->relations[$folderid][$synctime] ?? null;
} }
/** /**
* Return last storage error * Return last storage error
*/ */
public static function last_error() public static function last_error()
Show All 34 Lines
View Options

src/config/app.php

Show First 20 Lines • Show All 1,963 Lines • ▼ Show 20 Lines protected function relations_state_get($device_key, $folderid, $synctime)
0, 0,
1, 1,
$device_key, $device_key,
$folderid, $folderid,
$synctime $synctime
); );
if ($row = $db->fetch_assoc()) { if ($row = $db->fetch_assoc()) {
// MariaDB's datetime output includes microseconds, we need to remove them, // Don't use $row['synctime'] for the internal cache.
// it must be "Y-m-d H:i:s" format // The synctime of the found row is usually earlier than the requested synctime.
$synctime = preg_replace('/\.[0-9]+/', '', $row['synctime']); // Note: We use internal cache because there's a call to both hasChanges() and
// getChangedEntries() in Sync. It's needed until we add some caching on a higher level.
$this->relations[$folderid][$synctime] = json_decode($row['data'], true); $this->relations[$folderid][$synctime] = json_decode($row['data'], true);
}
mollekopfUnsubmitted
Done
Inline Actions

This copies the latest database entry into the current $synctime cache, so that seems to indeed make more sense than reusing the synctime of the previous database entry.

mollekopf: This copies the latest database entry into the current $synctime cache, so that seems to indeed…
// Cleanup: remove all records except the current one // Cleanup: remove all records except the current one
$db->query( $db->query(
"DELETE FROM `syncroton_relations_state`" "DELETE FROM `syncroton_relations_state`"
. " WHERE `device_id` = ? AND `folder_id` = ? AND `synctime` <> ?", . " WHERE `device_id` = ? AND `folder_id` = ? AND `synctime` <> ?",
$device_key, $device_key,
$folderid, $folderid,
$synctime $row['synctime'],
mollekopfUnsubmitted
Not Done
Inline Actions

But this is supposed to remove all cache entries except the current one which identified by $synctime, so if $synctime and $row['synctime'] are different we would remove the current cache entry and instead leave the previous one, no? It may not matter because we just always get the latest.

mollekopf: But this is supposed to remove all cache entries except the current one which identified by…
mollekopfUnsubmitted
Not Done
Inline Actions

nevermind, "current" is not the new entry, but the one that latest that exists.

mollekopf: nevermind, "current" is not the new entry, but the one that latest that exists.
); );
} }
}
return $this->relations[$folderid][$synctime] ?? null; return $this->relations[$folderid][$synctime] ?? null;
} }
/** /**
* Return last storage error * Return last storage error
*/ */
public static function last_error() public static function last_error()
Show All 34 Lines
View Options

src/resources/js/app.js

Loading...