mirror of
https://github.com/clearlinux/swupd-server.git
synced 2026-11-22 07:15:22 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
90c1c89183 | ||
|
|
010131eb85 | ||
|
|
fcf4e0d7fc | ||
|
|
6d3121cdc6 | ||
|
|
6190894f40 |
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
# Process this file with autoconf to produce a configure script.
|
# Process this file with autoconf to produce a configure script.
|
||||||
|
|
||||||
AC_PREREQ([2.66])
|
AC_PREREQ([2.66])
|
||||||
AC_INIT(swupd-server, 3.7.0, matthew.johnson@intel.com)
|
AC_INIT(swupd-server, 3.7.2, matthew.johnson@intel.com)
|
||||||
AM_INIT_AUTOMAKE([foreign -Wall -W subdir-objects])
|
AM_INIT_AUTOMAKE([foreign -Wall -W subdir-objects])
|
||||||
AM_SILENT_RULES([yes])
|
AM_SILENT_RULES([yes])
|
||||||
AC_PROG_CC
|
AC_PROG_CC
|
||||||
|
|||||||
@@ -198,6 +198,7 @@ extern void sort_manifest_by_version(struct manifest *manifest);
|
|||||||
extern bool manifest_includes(struct manifest *manifest, char *component);
|
extern bool manifest_includes(struct manifest *manifest, char *component);
|
||||||
extern bool changed_includes(struct manifest *old, struct manifest *new);
|
extern bool changed_includes(struct manifest *old, struct manifest *new);
|
||||||
extern int prune_manifest(struct manifest *manifest);
|
extern int prune_manifest(struct manifest *manifest);
|
||||||
|
extern void clean_renames(struct manifest *manifest);
|
||||||
extern int remove_deprecated_files(struct manifest *m1, struct manifest *m2, bool (*compfunc)(struct file *, struct file *));
|
extern int remove_deprecated_files(struct manifest *m1, struct manifest *m2, bool (*compfunc)(struct file *, struct file *));
|
||||||
extern void create_manifest_delta(int oldversion, int newversion, char *module);
|
extern void create_manifest_delta(int oldversion, int newversion, char *module);
|
||||||
extern void create_manifest_deltas(struct manifest *manifest, GList *last_versions_list);
|
extern void create_manifest_deltas(struct manifest *manifest, GList *last_versions_list);
|
||||||
@@ -257,6 +258,7 @@ extern void type_change_detection(struct manifest *manifest);
|
|||||||
|
|
||||||
extern void rename_detection(struct manifest *manifest);
|
extern void rename_detection(struct manifest *manifest);
|
||||||
extern void link_renames(GList *newfiles, int to_version);
|
extern void link_renames(GList *newfiles, int to_version);
|
||||||
|
extern void final_link(GList *files);
|
||||||
extern void __create_delta(struct file *file, int from_version, char *from_hash);
|
extern void __create_delta(struct file *file, int from_version, char *from_hash);
|
||||||
|
|
||||||
extern void account_delta_hit(void);
|
extern void account_delta_hit(void);
|
||||||
|
|||||||
+24
-3
@@ -336,7 +336,12 @@ int main(int argc, char **argv)
|
|||||||
apply_heuristics(new_full);
|
apply_heuristics(new_full);
|
||||||
match_manifests(old_full, new_full);
|
match_manifests(old_full, new_full);
|
||||||
|
|
||||||
old_deleted = remove_deprecated_files(old_full, new_full, both_deleted);
|
if (old_full->format < new_full->format) {
|
||||||
|
old_deleted = remove_deprecated_files(old_full, new_full, both_deleted);
|
||||||
|
} else {
|
||||||
|
old_deleted = 0;
|
||||||
|
}
|
||||||
|
|
||||||
if (old_deleted > 0) {
|
if (old_deleted > 0) {
|
||||||
LOG(NULL, "", "Old deleted files (%d) removed from full manifest", old_deleted);
|
LOG(NULL, "", "Old deleted files (%d) removed from full manifest", old_deleted);
|
||||||
printf("Old deleted files (%d) removed from full manifest\n", old_deleted);
|
printf("Old deleted files (%d) removed from full manifest\n", old_deleted);
|
||||||
@@ -402,9 +407,16 @@ int main(int argc, char **argv)
|
|||||||
/* Detect renamed files specifically for os-core */
|
/* Detect renamed files specifically for os-core */
|
||||||
rename_detection(new_core);
|
rename_detection(new_core);
|
||||||
#endif
|
#endif
|
||||||
old_deleted = remove_deprecated_files(old_core, new_core, both_deleted);
|
if (old_core->format < new_core->format) {
|
||||||
|
old_deleted = remove_deprecated_files(old_core, new_core, both_deleted);
|
||||||
|
} else {
|
||||||
|
old_deleted = 0;
|
||||||
|
}
|
||||||
|
|
||||||
old_ghosted = remove_deprecated_files(old_core, new_core, both_ghosted);
|
old_ghosted = remove_deprecated_files(old_core, new_core, both_ghosted);
|
||||||
sort_manifest_by_version(new_core); /* sorts by filename */
|
sort_manifest_by_version(new_core); /* sorts by filename */
|
||||||
|
/* clean up orphaned renames by marking them as deleted */
|
||||||
|
clean_renames(new_core);
|
||||||
newfiles = prune_manifest(new_core);
|
newfiles = prune_manifest(new_core);
|
||||||
if (newfiles <= 0) {
|
if (newfiles <= 0) {
|
||||||
LOG(NULL, "", "Core component has not changed (after pruning), exiting");
|
LOG(NULL, "", "Core component has not changed (after pruning), exiting");
|
||||||
@@ -524,10 +536,17 @@ int main(int argc, char **argv)
|
|||||||
rename_detection(newm);
|
rename_detection(newm);
|
||||||
#endif
|
#endif
|
||||||
/* Step 6b: otherwise, write out the manifest */
|
/* Step 6b: otherwise, write out the manifest */
|
||||||
old_deleted = remove_deprecated_files(oldm, newm, both_deleted);
|
if (oldm->format < newm->format) {
|
||||||
|
old_deleted = remove_deprecated_files(oldm, newm, both_deleted);
|
||||||
|
} else {
|
||||||
|
old_deleted = 0;
|
||||||
|
}
|
||||||
|
|
||||||
old_ghosted = remove_deprecated_files(oldm, newm, both_ghosted);
|
old_ghosted = remove_deprecated_files(oldm, newm, both_ghosted);
|
||||||
sort_manifest_by_version(newm);
|
sort_manifest_by_version(newm);
|
||||||
type_change_detection(newm);
|
type_change_detection(newm);
|
||||||
|
/* clean up orphaned renames by marking them as deleted */
|
||||||
|
clean_renames(newm);
|
||||||
newfiles = prune_manifest(newm);
|
newfiles = prune_manifest(newm);
|
||||||
if (newfiles > 0 || old_deleted > 0 || old_ghosted > 0 || changed_includes(oldm, newm)) {
|
if (newfiles > 0 || old_deleted > 0 || old_ghosted > 0 || changed_includes(oldm, newm)) {
|
||||||
LOG(NULL, "", "%s component has changes (%d new, %d deleted, %d ghosted), writing out new manifest", group, newfiles, old_deleted, old_ghosted);
|
LOG(NULL, "", "%s component has changes (%d new, %d deleted, %d ghosted), writing out new manifest", group, newfiles, old_deleted, old_ghosted);
|
||||||
@@ -568,6 +587,8 @@ int main(int argc, char **argv)
|
|||||||
maximize_to_full(new_MoM, new_full);
|
maximize_to_full(new_MoM, new_full);
|
||||||
|
|
||||||
sort_manifest_by_version(new_full);
|
sort_manifest_by_version(new_full);
|
||||||
|
/* clean up orphaned renames by marking them as deleted */
|
||||||
|
clean_renames(new_full);
|
||||||
prune_manifest(new_full);
|
prune_manifest(new_full);
|
||||||
if (write_manifest(new_full) != 0) {
|
if (write_manifest(new_full) != 0) {
|
||||||
goto exit;
|
goto exit;
|
||||||
|
|||||||
+33
-18
@@ -440,8 +440,11 @@ int match_manifests(struct manifest *m1, struct manifest *m2)
|
|||||||
file3->is_config = file1->is_config;
|
file3->is_config = file1->is_config;
|
||||||
file3->is_state = file1->is_state;
|
file3->is_state = file1->is_state;
|
||||||
file3->is_boot = file1->is_boot;
|
file3->is_boot = file1->is_boot;
|
||||||
|
file3->is_ghosted = file1->is_ghosted;
|
||||||
/* ghost deleted boot files */
|
/* ghost deleted boot files */
|
||||||
file3->is_ghosted = file1->is_boot && file1->is_deleted;
|
if (!file3->is_ghosted) {
|
||||||
|
file3->is_ghosted = file1->is_boot && file1->is_deleted;
|
||||||
|
}
|
||||||
|
|
||||||
if (file3->is_ghosted || file1->is_deleted) {
|
if (file3->is_ghosted || file1->is_deleted) {
|
||||||
/* if the new file is ghosted or the file was deleted, preserve
|
/* if the new file is ghosted or the file was deleted, preserve
|
||||||
@@ -983,10 +986,9 @@ bool changed_includes(struct manifest *old, struct manifest *new)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* For a format bump, it's convenient to remove deleted files from manifests
|
/* Remove files deprecated in this version as identified by the compfunc
|
||||||
* that last changed prior to the format bump, since they are no longer
|
* function. This function can be used to remove old deleted files over a format
|
||||||
* considered for deletion as part of an update.
|
* bump and remove deprecated ghosted files.
|
||||||
*
|
|
||||||
* Note: this function should be called after match_manifests().
|
* Note: this function should be called after match_manifests().
|
||||||
*/
|
*/
|
||||||
int remove_deprecated_files(struct manifest *m1, struct manifest *m2, bool (*compfunc)(struct file *file1, struct file *file2))
|
int remove_deprecated_files(struct manifest *m1, struct manifest *m2, bool (*compfunc)(struct file *file1, struct file *file2))
|
||||||
@@ -1005,11 +1007,6 @@ int remove_deprecated_files(struct manifest *m1, struct manifest *m2, bool (*com
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* This is the common case, so bail early, reporting no deletions */
|
|
||||||
if (m1->format == m2->format) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* At this point, the manifest formats mismatch, and it's assumed that
|
/* At this point, the manifest formats mismatch, and it's assumed that
|
||||||
* m1 is the old manifest, and m2 is the new.
|
* m1 is the old manifest, and m2 is the new.
|
||||||
*/
|
*/
|
||||||
@@ -1050,6 +1047,32 @@ int remove_deprecated_files(struct manifest *m1, struct manifest *m2, bool (*com
|
|||||||
return count;
|
return count;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Performs a final link of renames in the manifest to catch any renames from
|
||||||
|
* old versions and then removes any orphaned renames */
|
||||||
|
void clean_renames(struct manifest *manifest)
|
||||||
|
{
|
||||||
|
GList *list;
|
||||||
|
struct file *file;
|
||||||
|
|
||||||
|
/* make sure all renames are linked, this is necessary for renames
|
||||||
|
* from old manifests that carry over to the current one */
|
||||||
|
final_link(manifest->files);
|
||||||
|
|
||||||
|
list = g_list_first(manifest->files);
|
||||||
|
while (list) {
|
||||||
|
file = list->data;
|
||||||
|
/* if the file is marked as deleted and renamed it is a
|
||||||
|
* renamed-from file. If the rename_peer field is still NULL
|
||||||
|
* then it has been orphaned. Mark these as deleted */
|
||||||
|
if (file->is_deleted && file->is_rename && !file->rename_peer) {
|
||||||
|
hash_set_zeros(file->hash);
|
||||||
|
file->is_rename = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
list = g_list_next(list);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/* Conditionally remove some things from a manifest.
|
/* Conditionally remove some things from a manifest.
|
||||||
* Returns > 0 when the pruned manifest has new files.
|
* Returns > 0 when the pruned manifest has new files.
|
||||||
* Returns 0 when the pruned manifest no longer has new files.
|
* Returns 0 when the pruned manifest no longer has new files.
|
||||||
@@ -1068,14 +1091,6 @@ int prune_manifest(struct manifest *manifest)
|
|||||||
next = g_list_next(list);
|
next = g_list_next(list);
|
||||||
file = list->data;
|
file = list->data;
|
||||||
|
|
||||||
/* if the file is marked as deleted and renamed it is a renamed_from
|
|
||||||
* file. If the rename_peer field is still NULL then it has been
|
|
||||||
* orphaned. Prune these files */
|
|
||||||
if (file->is_deleted && file->is_rename && !file->rename_peer) {
|
|
||||||
manifest->files = g_list_delete_link(manifest->files, list);
|
|
||||||
manifest->count--;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (OS_IS_STATELESS && (!file->is_deleted) && (file->is_config)) {
|
if (OS_IS_STATELESS && (!file->is_deleted) && (file->is_config)) {
|
||||||
// toward being a stateless OS
|
// toward being a stateless OS
|
||||||
LOG(file, "Skipping config file in manifest write", "component %s", manifest->component);
|
LOG(file, "Skipping config file in manifest write", "component %s", manifest->component);
|
||||||
|
|||||||
@@ -446,6 +446,48 @@ redo:
|
|||||||
g_list_free(deleted_files);
|
g_list_free(deleted_files);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void final_link(GList *files)
|
||||||
|
{
|
||||||
|
GList *list1, *list2;
|
||||||
|
struct file *file1, *file2;
|
||||||
|
|
||||||
|
list1 = new_list_renamed_files(files);
|
||||||
|
list1 = list2 = g_list_sort(list1, file_sort_version);
|
||||||
|
|
||||||
|
for (; list1; list1 = g_list_next(list1)) {
|
||||||
|
file1 = list1->data;
|
||||||
|
/* do not re-link already-linked renames */
|
||||||
|
if (file1->rename_peer != NULL) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* check the rest of the list */
|
||||||
|
list2 = g_list_next(list1);
|
||||||
|
for (; list2; list2 = g_list_next(list2)) {
|
||||||
|
file2 = list2->data;
|
||||||
|
/* must be the same version to link */
|
||||||
|
if (file1->last_change != file2->last_change) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* need one and only one to be deleted to link as this
|
||||||
|
* indicates a renamed-from/renamed-to relationship
|
||||||
|
* (.d.r -> F..r) */
|
||||||
|
if (file1->is_deleted == file2->is_deleted) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* must have same hash to link */
|
||||||
|
if (!hash_compare(file2->hash, file1->hash)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
file1->rename_peer = file2;
|
||||||
|
file2->rename_peer = file1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/* What do we need this for?
|
/* What do we need this for?
|
||||||
*
|
*
|
||||||
* rename_detection has already set up the links in the manifest it
|
* rename_detection has already set up the links in the manifest it
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ setup() {
|
|||||||
# version 20: add a new boot file
|
# version 20: add a new boot file
|
||||||
[ 1 -eq $(grep 'F\.b\. .* 20 /usr/lib/kernel/baz' $DIR/www/20/Manifest.full | wc -l) ]
|
[ 1 -eq $(grep 'F\.b\. .* 20 /usr/lib/kernel/baz' $DIR/www/20/Manifest.full | wc -l) ]
|
||||||
# version 30: old ghosted file /usr/lib/kernel/bar cleaned up
|
# version 30: old ghosted file /usr/lib/kernel/bar cleaned up
|
||||||
[ 0 -eq $(grep '10 /usr/lib/kernel/bar' $DIR/www/30/Manifest.full | wc -l) ]
|
[ 0 -eq $(grep '/usr/lib/kernel/bar' $DIR/www/30/Manifest.full | wc -l) ]
|
||||||
# version 30: boot file added in version 20 ghosted
|
# version 30: boot file added in version 20 ghosted
|
||||||
[ 1 -eq $(grep '\.gb\. .* 30 /usr/lib/kernel/baz' $DIR/www/30/Manifest.full | wc -l) ]
|
[ 1 -eq $(grep '\.gb\. .* 30 /usr/lib/kernel/baz' $DIR/www/30/Manifest.full | wc -l) ]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,11 +26,25 @@ setup() {
|
|||||||
track_bundle 30 os-core
|
track_bundle 30 os-core
|
||||||
track_bundle 30 test-bundle
|
track_bundle 30 test-bundle
|
||||||
|
|
||||||
|
set_os_release 40 os-core
|
||||||
|
set_os_release 40 test-bundle
|
||||||
|
track_bundle 40 os-core
|
||||||
|
track_bundle 40 test-bundle
|
||||||
|
|
||||||
|
# /usr/lib/bar and /one will be renamed to /usr/lib/baz and /two
|
||||||
gen_file_plain_with_content 10 test-bundle /usr/lib/bar "$(seq 100)"
|
gen_file_plain_with_content 10 test-bundle /usr/lib/bar "$(seq 100)"
|
||||||
|
gen_file_plain_with_content 10 test-bundle /one "$(printf 'a%.0s' {1..200})"
|
||||||
|
|
||||||
gen_file_plain_with_content 20 test-bundle /usr/lib/baz "$(seq 100)"
|
gen_file_plain_with_content 20 test-bundle /usr/lib/baz "$(seq 100)"
|
||||||
|
gen_file_plain_with_content 20 test-bundle /two "$(printf 'a%.0s' {1..200})"
|
||||||
|
|
||||||
# different content just to make sure this works with delta renames as well as
|
# different content just to make sure this works with delta renames as well as
|
||||||
# direct renames
|
# direct renames
|
||||||
gen_file_plain_with_content 30 test-bundle /usr/lib/foo "$(seq 100) new"
|
gen_file_plain_with_content 30 test-bundle /usr/lib/foo "$(seq 100) new"
|
||||||
|
|
||||||
|
gen_file_plain_with_content 40 test-bundle /usr/lib/foo "$(seq 100) new"
|
||||||
|
# new file to force manifest generation
|
||||||
|
gen_file_plain_with_content 40 test-bundle /a "testfile"
|
||||||
}
|
}
|
||||||
|
|
||||||
@test "create updates with renamed-to file getting deleted" {
|
@test "create updates with renamed-to file getting deleted" {
|
||||||
@@ -46,16 +60,36 @@ setup() {
|
|||||||
|
|
||||||
sudo $CREATE_UPDATE --osversion 30 --statedir $DIR --format 3
|
sudo $CREATE_UPDATE --osversion 30 --statedir $DIR --format 3
|
||||||
sudo $MAKE_FULLFILES --statedir $DIR 30
|
sudo $MAKE_FULLFILES --statedir $DIR 30
|
||||||
# version 10: add file to 10
|
|
||||||
[ 1 -eq $(grep 'F\.\.\. .* 10 /usr/lib/bar' $DIR/www/10/Manifest.test-bundle | wc -l) ]
|
set_latest_ver 30
|
||||||
# version 20: rename bar to baz
|
|
||||||
[ 1 -eq $(grep '\.d\.r .* 20 /usr/lib/bar' $DIR/www/20/Manifest.test-bundle | wc -l) ]
|
sudo $CREATE_UPDATE --osversion 40 --statedir $DIR --format 3
|
||||||
[ 1 -eq $(grep 'F\.\.r .* 20 /usr/lib/baz' $DIR/www/20/Manifest.test-bundle | wc -l) ]
|
sudo $MAKE_FULLFILES --statedir $DIR 40
|
||||||
# version 30: prune original renamed-from file (bar), baz is now a renamed-from file
|
# version 10: add files to 10
|
||||||
# Check for the new renamed-to file (foo)
|
[ 1 -eq $(grep $'F\.\.\.\t.*\t10\t/usr/lib/bar' $DIR/www/10/Manifest.test-bundle | wc -l) ]
|
||||||
[ 0 -eq $(grep '/usr/lib/bar' $DIR/www/30/Manifest.test-bundle | wc -l) ]
|
[ 1 -eq $(grep $'F\.\.\.\t.*\t10\t/one' $DIR/www/10/Manifest.test-bundle | wc -l) ]
|
||||||
[ 1 -eq $(grep '\.d\.r .* 30 /usr/lib/baz' $DIR/www/30/Manifest.test-bundle | wc -l) ]
|
# version 20: rename bar to baz and one to two
|
||||||
[ 1 -eq $(grep 'F\.\.r .* 30 /usr/lib/foo' $DIR/www/30/Manifest.test-bundle | wc -l) ]
|
[ 1 -eq $(grep $'\.d\.r\t.*\t20\t/one' $DIR/www/20/Manifest.test-bundle | wc -l) ]
|
||||||
|
[ 1 -eq $(grep $'F\.\.r\t.*\t20\t/two' $DIR/www/20/Manifest.test-bundle | wc -l) ]
|
||||||
|
[ 1 -eq $(grep $'\.d\.r\t.*\t20\t/usr/lib/bar' $DIR/www/20/Manifest.test-bundle | wc -l) ]
|
||||||
|
[ 1 -eq $(grep $'F\.\.r\t.*\t20\t/usr/lib/baz' $DIR/www/20/Manifest.test-bundle | wc -l) ]
|
||||||
|
# version 30: original renamed-from file (bar) is now orphaned and therefore
|
||||||
|
# deleted, baz is now a renamed-from file and foo is a renamed-to file.
|
||||||
|
# /two was deleted in this version, so both /one and /two should be marked as
|
||||||
|
# deleted
|
||||||
|
[ 1 -eq $(grep $'\.d\.\.\t0\{64\}\t20\t/one' $DIR/www/30/Manifest.test-bundle | wc -l) ]
|
||||||
|
[ 1 -eq $(grep $'\.d\.\.\t0\{64\}\t30\t/two' $DIR/www/30/Manifest.test-bundle | wc -l) ]
|
||||||
|
[ 1 -eq $(grep $'\.d\.\.\t0\{64\}\t20\t/usr/lib/bar' $DIR/www/30/Manifest.test-bundle | wc -l) ]
|
||||||
|
[ 1 -eq $(grep $'\.d\.r\t.*\t30\t/usr/lib/baz' $DIR/www/30/Manifest.test-bundle | wc -l) ]
|
||||||
|
[ 1 -eq $(grep $'F\.\.r\t.*\t30\t/usr/lib/foo' $DIR/www/30/Manifest.test-bundle | wc -l) ]
|
||||||
|
|
||||||
|
# version 40: the existing rename from baz -> foo must persist while all
|
||||||
|
# others remain deleted
|
||||||
|
[ 1 -eq $(grep $'\.d\.\.\t0\{64\}\t20\t/one' $DIR/www/40/Manifest.test-bundle | wc -l) ]
|
||||||
|
[ 1 -eq $(grep $'\.d\.\.\t0\{64\}\t30\t/two' $DIR/www/40/Manifest.test-bundle | wc -l) ]
|
||||||
|
[ 1 -eq $(grep $'\.d\.\.\t0\{64\}\t20\t/usr/lib/bar' $DIR/www/40/Manifest.test-bundle | wc -l) ]
|
||||||
|
[ 1 -eq $(grep $'\.d\.r\t.*\t30\t/usr/lib/baz' $DIR/www/40/Manifest.test-bundle | wc -l) ]
|
||||||
|
[ 1 -eq $(grep $'F\.\.r\t.*\t30\t/usr/lib/foo' $DIR/www/40/Manifest.test-bundle | wc -l) ]
|
||||||
}
|
}
|
||||||
|
|
||||||
# vi: ft=sh ts=8 sw=2 sts=2 et tw=80
|
# vi: ft=sh ts=8 sw=2 sts=2 et tw=80
|
||||||
|
|||||||
Reference in New Issue
Block a user