Overview
| Comment: | Simplified user fsuid switching |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | tcl-ops |
| Files: | files | file ages | folders |
| SHA1: |
9562d42ae16a47710167fb08a08de9f0 |
| User & Date: | rkeene on 2014-11-10 05:30:53 |
| Other Links: | branch diff | manifest | tags |
Context
|
2014-11-10
| ||
| 05:38 | Updated to compute number of children for each type of node so that things like "find" work reliably check-in: 9e96bce564 user: rkeene tags: tcl-ops | |
| 05:30 | Simplified user fsuid switching check-in: 9562d42ae1 user: rkeene tags: tcl-ops | |
| 05:02 | Minor re-ordering so that FUSE things can be "near" each other check-in: f4e6b62dfb user: rkeene tags: tcl-ops | |
Changes
Modified appfsd.c from [405b834b47] to [1dcdd9bb28].
| ︙ | ︙ | |||
499 500 501 502 503 504 505 |
int tcl_ret;
interp = appfs_TclInterp();
if (interp == NULL) {
return(-EIO);
}
| < < < < < | 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 |
int tcl_ret;
interp = appfs_TclInterp();
if (interp == NULL) {
return(-EIO);
}
tcl_ret = appfs_Tcl_Eval(interp, 2, "::appfs::getattr", path);
if (tcl_ret != TCL_OK) {
APPFS_DEBUG("::appfs::getattr(%s) failed.", path);
APPFS_DEBUG("Tcl Error is: %s", Tcl_GetStringResult(interp));
return(-ENOENT);
}
|
| ︙ | ︙ | |||
781 782 783 784 785 786 787 |
if (interp == NULL) {
return(0);
}
filler(buf, ".", NULL, 0);
filler(buf, "..", NULL, 0);
| < < < < < | 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 |
if (interp == NULL) {
return(0);
}
filler(buf, ".", NULL, 0);
filler(buf, "..", NULL, 0);
tcl_ret = appfs_Tcl_Eval(interp, 2, "::appfs::getchildren", path);
if (tcl_ret != TCL_OK) {
APPFS_DEBUG("::appfs::getchildren(%s) failed.", path);
APPFS_DEBUG("Tcl Error is: %s", Tcl_GetStringResult(interp));
return(0);
}
|
| ︙ | ︙ | |||
849 850 851 852 853 854 855 |
}
interp = appfs_TclInterp();
if (interp == NULL) {
return(-EIO);
}
| < < < < < < < < | 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 |
}
interp = appfs_TclInterp();
if (interp == NULL) {
return(-EIO);
}
tcl_ret = appfs_Tcl_Eval(interp, 3, "::appfs::openpath", path, mode);
if (tcl_ret != TCL_OK) {
APPFS_DEBUG("::appfs::openpath(%s, %s) failed.", path, mode);
APPFS_DEBUG("Tcl Error is: %s", Tcl_GetStringResult(interp));
return(-EIO);
}
real_path = Tcl_GetStringResult(interp);
if (real_path == NULL) {
return(-EIO);
}
APPFS_DEBUG("Translated request to open %s to opening %s (mode = \"%s\")", path, real_path, mode);
fh = open(real_path, fi->flags, 0600);
if (fh < 0) {
return(-EIO);
}
fi->fh = fh;
return(0);
|
| ︙ | ︙ | |||
940 941 942 943 944 945 946 |
return(-EPERM);
}
if ((mode & S_IFBLK) == S_IFBLK) {
return(-EPERM);
}
| < < < < > > | 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 |
return(-EPERM);
}
if ((mode & S_IFBLK) == S_IFBLK) {
return(-EPERM);
}
real_path = appfs_prepare_to_create(path);
if (real_path == NULL) {
return(-EIO);
}
appfs_simulate_user_fs_enter();
mknod_ret = mknod(real_path, mode, device);
appfs_simulate_user_fs_leave();
free(real_path);
|
| ︙ | ︙ | |||
976 977 978 979 980 981 982 |
return(-EPERM);
}
if ((mode & S_IFBLK) == S_IFBLK) {
return(-EPERM);
}
| < < < < > > | 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 |
return(-EPERM);
}
if ((mode & S_IFBLK) == S_IFBLK) {
return(-EPERM);
}
real_path = appfs_prepare_to_create(path);
if (real_path == NULL) {
return(-EIO);
}
appfs_simulate_user_fs_enter();
fd = creat(real_path, mode);
appfs_simulate_user_fs_leave();
free(real_path);
|
| ︙ | ︙ | |||
1037 1038 1039 1040 1041 1042 1043 |
APPFS_DEBUG("Enter (path = %s, ...)", path);
interp = appfs_TclInterp();
if (interp == NULL) {
return(-EIO);
}
| < < < < < < | | < | > | 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 |
APPFS_DEBUG("Enter (path = %s, ...)", path);
interp = appfs_TclInterp();
if (interp == NULL) {
return(-EIO);
}
tcl_ret = appfs_Tcl_Eval(interp, 2, "::appfs::unlinkpath", path);
if (tcl_ret != TCL_OK) {
APPFS_DEBUG("::appfs::unlinkpath(%s) failed.", path);
APPFS_DEBUG("Tcl Error is: %s", Tcl_GetStringResult(interp));
return(-EIO);
}
return(0);
}
static int appfs_fuse_mkdir(const char *path, mode_t mode) {
char *real_path;
int mkdir_ret;
APPFS_DEBUG("Enter (path = %s, ...)", path);
real_path = appfs_prepare_to_create(path);
if (real_path == NULL) {
return(-EIO);
}
appfs_simulate_user_fs_enter();
mkdir_ret = mkdir(real_path, mode);
appfs_simulate_user_fs_leave();
free(real_path);
|
| ︙ | ︙ | |||
1095 1096 1097 1098 1099 1100 1101 |
APPFS_DEBUG("Enter (path = %s, ...)", path);
interp = appfs_TclInterp();
if (interp == NULL) {
return(-EIO);
}
| < < < < | | < | > | 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 |
APPFS_DEBUG("Enter (path = %s, ...)", path);
interp = appfs_TclInterp();
if (interp == NULL) {
return(-EIO);
}
tcl_ret = appfs_Tcl_Eval(interp, 3, "::appfs::openpath", path, "write");
if (tcl_ret != TCL_OK) {
APPFS_DEBUG("::appfs::openpath(%s, %s) failed.", path, "write");
APPFS_DEBUG("Tcl Error is: %s", Tcl_GetStringResult(interp));
return(-EIO);
}
real_path = Tcl_GetStringResult(interp);
if (real_path == NULL) {
return(-EIO);
}
appfs_simulate_user_fs_enter();
chmod_ret = chmod(real_path, mode);
appfs_simulate_user_fs_leave();
return(chmod_ret);
}
|
| ︙ | ︙ |
Modified appfsd.tcl from [649eb3a6a1] to [969f157ddb].
| ︙ | ︙ | |||
119 120 121 122 123 124 125 126 127 128 129 130 131 132 |
"noarch" - "none" - "any" - "all" {
return "noarch"
}
}
return -code error "Unable to normalize CPU: $cpu"
}
proc init {} {
if {[info exists ::appfs::init_called]} {
return
}
# Force [parray] to be loaded
| > > > > > > > > > > | 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 |
"noarch" - "none" - "any" - "all" {
return "noarch"
}
}
return -code error "Unable to normalize CPU: $cpu"
}
proc _as_user {code} {
::appfsd::simulate_user_fs_enter
set retcode [catch [list uplevel $code] retstr]
::appfsd::simulate_user_fs_leave
return -code $retcode $retstr
}
proc init {} {
if {[info exists ::appfs::init_called]} {
return
}
# Force [parray] to be loaded
|
| ︙ | ︙ | |||
156 157 158 159 160 161 162 |
# Create indexes
db eval {CREATE INDEX IF NOT EXISTS sites_index ON sites (hostname);}
db eval {CREATE INDEX IF NOT EXISTS packages_index ON packages (hostname, package, version, os, cpuArch);}
db eval {CREATE INDEX IF NOT EXISTS files_index ON files (package_sha1, file_name, file_directory);}
}
proc download {hostname hash {method sha1}} {
| < < < < | 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 |
# Create indexes
db eval {CREATE INDEX IF NOT EXISTS sites_index ON sites (hostname);}
db eval {CREATE INDEX IF NOT EXISTS packages_index ON packages (hostname, package, version, os, cpuArch);}
db eval {CREATE INDEX IF NOT EXISTS files_index ON files (package_sha1, file_name, file_directory);}
}
proc download {hostname hash {method sha1}} {
set url [_construct_url $hostname $hash $method]
set file [_cachefile $url $hash]
if {![file exists $file]} {
return -code error "Unable to fetch (file does not exist: $file)"
}
return $file
}
|
| ︙ | ︙ | |||
464 465 466 467 468 469 470 |
catch {
::appfs::getpkgmanifest $pathinfo(hostname) $pathinfo(package_sha1)
}
set retval [::appfs::db eval {SELECT DISTINCT file_name FROM files WHERE package_sha1 = $pathinfo(package_sha1) AND file_directory = $pathinfo(file);}]
if {[info exists pathinfo(package)] && [info exists pathinfo(hostname)] && [info exists pathinfo(file)]} {
| > | | | | | | | | | | | | | | | | | | | | > | 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 |
catch {
::appfs::getpkgmanifest $pathinfo(hostname) $pathinfo(package_sha1)
}
set retval [::appfs::db eval {SELECT DISTINCT file_name FROM files WHERE package_sha1 = $pathinfo(package_sha1) AND file_directory = $pathinfo(file);}]
if {[info exists pathinfo(package)] && [info exists pathinfo(hostname)] && [info exists pathinfo(file)]} {
_as_user {
set dir [_localpath $pathinfo(package) $pathinfo(hostname) $pathinfo(file)]
set whiteoutdir [string range [_whiteoutpath $pathinfo(package) $pathinfo(hostname) $pathinfo(file)] 0 end-15]
foreach file [glob -nocomplain -tails -directory $whiteoutdir {{.,}*.APPFS.WHITEOUT}] {
set remove [string range $file 0 end-15]
set idx [lsearch -exact $retval $remove]
if {$idx != -1} {
set retval [lreplace $retval $idx $idx]
}
}
foreach file [glob -nocomplain -tails -directory $dir -types {d f l p s} {{.,}*}] {
if {$file == "." || $file == ".."} {
continue
}
if {$file == ".APPFS.WHITEOUT"} {
continue
}
if {[lsearch -exact $retval $file] != -1} {
continue
}
lappend retval $file
}
}
}
return $retval
}
}
|
| ︙ | ︙ | |||
511 512 513 514 515 516 517 |
::appfs::getindex $pathinfo(hostname)
::appfs::getpkgmanifest $pathinfo(hostname) $pathinfo(package_sha1)
}
switch -- $pathinfo(_type) {
"toplevel" {
set retval(type) directory
| | | 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 |
::appfs::getindex $pathinfo(hostname)
::appfs::getpkgmanifest $pathinfo(hostname) $pathinfo(package_sha1)
}
switch -- $pathinfo(_type) {
"toplevel" {
set retval(type) directory
set retval(childcount) 2
}
"sites" {
set check [::appfs::db onecolumn {SELECT 1 FROM packages WHERE hostname = $pathinfo(hostname);}]
if {$check == "1"} {
set retval(type) directory
set retval(childcount) 2;
}
|
| ︙ | ︙ | |||
564 565 566 567 568 569 570 |
set retval(localpath) $localpath
set retval(whiteoutpath) $whiteoutpath
if {[file exists $localpath]} {
set retval(is_localfile) 1
catch {
| > | > > | | | | > > > | > | 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 |
set retval(localpath) $localpath
set retval(whiteoutpath) $whiteoutpath
if {[file exists $localpath]} {
set retval(is_localfile) 1
catch {
_as_user {
file lstat $localpath localpathinfo
}
set retval(time) $localpathinfo(mtime)
switch -- $localpathinfo(type) {
"directory" {
set retval(type) "directory"
set retval(childcount) 2
}
"file" {
set retval(type) "file"
set retval(size) $localpathinfo(size)
_as_user {
if {[file executable $localpath]} {
set retval(perms) "x"
} else {
set retval(perms) ""
}
}
}
"link" {
set retval(type) "symlink"
_as_user {
set retval(source) [file readlink $localpath]
}
}
"fifo" {
# Capitalized so that the first char is unique
set retval(type) "Fifo"
}
"socket" {
# Capitalized so that the first char is unique
|
| ︙ | ︙ | |||
651 652 653 654 655 656 657 |
if {$pkgpathinfo(file_sha1) == ""} {
return -code error "No such file or directory"
}
set localcachefile [download $pathinfo(hostname) $pkgpathinfo(file_sha1)]
if {$mode == "write"} {
| > | | | | | | | | | | | | | | > | 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 |
if {$pkgpathinfo(file_sha1) == ""} {
return -code error "No such file or directory"
}
set localcachefile [download $pathinfo(hostname) $pkgpathinfo(file_sha1)]
if {$mode == "write"} {
_as_user {
set tmplocalpath "${localpath}.[expr rand()][clock clicks]"
set failed 0
if {[catch {
file mkdir [file dirname $localpath]
file copy -force -- $localcachefile $tmplocalpath
if {$pkgpathinfo(perms) == "x"} {
file attributes $tmplocalpath -permissions +x
}
file rename -force -- $tmplocalpath $localpath
} err]} {
set failed 1
}
catch {
file delete -force -- $tmplocalpath
}
}
if {$failed} {
return -code error $err
}
return $localpath
|
| ︙ | ︙ | |||
719 720 721 722 723 724 725 | } } set filename [localpath $path] set dirname [file dirname $filename] | > | > | 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 |
}
}
set filename [localpath $path]
set dirname [file dirname $filename]
_as_user {
file mkdir $dirname
}
return $filename
}
proc unlinkpath {path} {
array set pathattrs [exists $path]
|
| ︙ | ︙ | |||
742 743 744 745 746 747 748 |
set children [getchildren $path]
if {[llength $children] != 0} {
return -code error "Asked to delete non-empty directory"
}
}
| > | > > > | | | | > | 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 |
set children [getchildren $path]
if {[llength $children] != 0} {
return -code error "Asked to delete non-empty directory"
}
}
_as_user {
file delete -force -- $localpath
}
} elseif {[info exists pathattrs(is_remotefile)]} {
if {$pathattrs(type) == "directory"} {
set children [getchildren $path]
if {[llength $children] != 0} {
return -code error "Asked to delete non-empty directory"
}
}
} else {
return -code error "Unknown if file is remote or local !?"
}
set whiteoutfile $pathattrs(whiteoutpath)
set whiteoutdir [file dirname $whiteoutfile]
_as_user {
file mkdir $whiteoutdir
close [open $whiteoutfile w]
}
}
}
|