makary/bookmarkfs
1
0
Fork 0
mirror of https://git.sr.ht/~cismonx/bookmarkfs synced 2025-06-07 19:58:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

backend: allow bad system time in readonly mode

Browse source 
In readonly mode, we're not using the current time as timestamp,
thus a bad system time won't hurt.

Also in Chromium backend, use zero timestamp for the bookmark root
dir, to accomodate this change (no one cares about it anyway).
This commit is contained in:
CismonX 2025-03-23 14:56:16 +08:00
parent 03b638408d
commit 3422d68193
No known key found for this signature in database
GPG key ID: 3094873E29A482FB
2 changed files with 39 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
src/backend_chromium.c
View file

@ -197,6 +197,7 @@ static int build_node (struct backend_ctx *, json_t *, char const **,
static int build_node_guid (json_t *, struct hashmap const *, uint8_t *,
unsigned long *);
static int build_node_id (json_t *, uint64_t *);
static void build_tsnode (struct timespec const *, json_t **);
static int chksum_iter_cb (void *, json_t *, json_t *, void **);
static int chksum_root (struct backend_ctx *, char *);
static int chksum_utf16 (struct chksum_iter_ctx *, char const *, size_t);
@ -217,7 +218,6 @@ static int assocmap_comp (union hashmap_key, void const *);
static unsigned long
assocmap_hash (void const *);
static int build_maps (struct backend_ctx *);
static void build_tsnode (struct timespec const *, json_t **);
static void free_bgcookie (struct bookmark_gcookie *);
static void free_blcookie (struct bookmark_lcookie *);
static void free_entry_cb (void *, void *);
@ -376,6 +376,27 @@ build_node_id (
return 0;
}
static void
build_tsnode (
struct timespec const *ts,
json_t **node_ptr
) {
struct timespec now;
if (ts == NULL) {
xgetrealtime(&now);
ts = &now;
}
time_t secs = ts->tv_sec + EPOCH_DIFF;
int64_t microsecs = secs * 1000000 + ts->tv_nsec / 1000;
char buf[32];
int nbytes = snprintf(buf, sizeof(buf), "%" PRIi64, microsecs);
xassert(nbytes > 0 && (size_t)nbytes < sizeof(buf));
*node_ptr = json_stringn_nocheck(buf, nbytes);
}
// See Chromium source code: /components/bookmarks/browser/bookmark_codec.cc
static int
chksum_iter_cb (
@ -698,9 +719,7 @@ static int
build_maps (
struct backend_ctx *ctx
) {
json_t *ts_node;
build_tsnode(NULL, &ts_node);
json_t *ts_node = json_sstring("0");
json_t *root = json_object();
json_t *children = json_array();
json_object_sset_new(root, "children", children);
@ -761,27 +780,6 @@ build_maps (
return -1;
}
static void
build_tsnode (
struct timespec const *ts,
json_t **node_ptr
) {
struct timespec now;
if (ts == NULL) {
xgetrealtime(&now);
ts = &now;
}
time_t secs = ts->tv_sec + EPOCH_DIFF;
int64_t microsecs = secs * 1000000 + ts->tv_nsec / 1000;
char buf[32];
int nbytes = snprintf(buf, sizeof(buf), "%" PRIi64, microsecs);
xassert(nbytes > 0 && (size_t)nbytes < sizeof(buf));
*node_ptr = json_stringn_nocheck(buf, nbytes);
}
static void
free_bgcookie (
struct bookmark_gcookie *cookie
@ -1594,12 +1592,19 @@ backend_create (
struct bookmarkfs_backend_conf const *conf,
struct bookmarkfs_backend_create_resp *resp
) {
#ifndef BOOKMARKFS_BACKEND_CHROMIUM_WRITE
if (!(conf->flags & BOOKMARKFS_BACKEND_READONLY)) {
#ifdef BOOKMARKFS_BACKEND_CHROMIUM_WRITE
struct timespec now;
xgetrealtime(&now);
if (!valid_ts_sec(now.tv_sec)) {
log_puts("bad system time");
return -1;
}
#else /* !defined(BOOKMARKFS_BACKEND_CHROMIUM_WRITE) */
log_puts("write support is not enabled on this build");
return -1;
#endif /* defined(BOOKMARKFS_BACKEND_CHROMIUM_WRITE) */
}
#endif
struct parsed_mntopts opts = { 0 };
if (0 != parse_mntopts(conf->opts, conf->flags, &opts)) {
@ -1708,13 +1713,6 @@ static int
backend_init (
uint32_t flags
) {
struct timespec now;
xgetrealtime(&now);
if (!valid_ts_sec(now.tv_sec)) {
log_puts("bad system time");
return -1;
}
if (!(flags & BOOKMARKFS_BACKEND_LIB_READY)) {
if (0 != bookmarkfs_lib_init()) {
return -1;

14
src/backend_firefox.c
View file

@ -2844,6 +2844,13 @@ backend_create (
bool readonly = conf->flags & BOOKMARKFS_BACKEND_READONLY;
if (!readonly) {
#ifdef BOOKMARKFS_BACKEND_FIREFOX_WRITE
struct timespec now;
xgetrealtime(&now);
if (!valid_ts_sec(now.tv_sec)) {
log_puts("bad system time");
return -1;
}
int minver = 3035000; // required for the RETURNING clause
int vernum = sqlite3_libversion_number();
if (vernum < minver) {
@ -2998,13 +3005,6 @@ static int
backend_init (
uint32_t flags
) {
struct timespec now;
xgetrealtime(&now);
if (!valid_ts_sec(now.tv_sec)) {
log_puts("bad system time");
return -1;
}
if (!(flags & BOOKMARKFS_BACKEND_LIB_READY)
&& !(flags & BOOKMARKFS_FRONTEND_MKFS)
) {