Overview
Comment: | OFSandbox: Add support for unveil() |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
648522a4e6fe79368bcb8c58c717d3e4 |
User & Date: | js on 2018-11-04 16:24:41 |
Other Links: | manifest | tags |
Context
2018-11-04
| ||
17:51 | ofarc: Use OFSandbox's new unveiling check-in: dec64f3a50 user: js tags: trunk | |
16:24 | OFSandbox: Add support for unveil() check-in: 648522a4e6 user: js tags: trunk | |
13:29 | autogen.sh: Use automake 1.16 on OpenBSD check-in: dc4c0a3d6b user: js tags: trunk | |
Changes
Modified src/OFApplication.h from [057a1878e6] to [6e9b955715].
︙ | ︙ | |||
133 134 135 136 137 138 139 | id <OFApplicationDelegate> _Nullable _delegate; void (*_Nullable _SIGINTHandler)(id, SEL); #ifndef OF_WINDOWS void (*_Nullable _SIGHUPHandler)(id, SEL); void (*_Nullable _SIGUSR1Handler)(id, SEL); void (*_Nullable _SIGUSR2Handler)(id, SEL); #endif | > | > | 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 | id <OFApplicationDelegate> _Nullable _delegate; void (*_Nullable _SIGINTHandler)(id, SEL); #ifndef OF_WINDOWS void (*_Nullable _SIGHUPHandler)(id, SEL); void (*_Nullable _SIGUSR1Handler)(id, SEL); void (*_Nullable _SIGUSR2Handler)(id, SEL); #endif #ifdef OF_HAVE_SANDBOX OFSandbox *_Nullable _activeSandbox, *_Nullable _activeExecSandbox; #endif } #ifdef OF_HAVE_CLASS_PROPERTIES @property (class, readonly, nullable, nonatomic) OFApplication *sharedApplication; @property (class, readonly, nullable, nonatomic) OFString *programName; @property (class, readonly, nullable, nonatomic) |
︙ | ︙ | |||
168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 | /*! * @brief The delegate of the application. */ @property OF_NULLABLE_PROPERTY (assign, nonatomic) id <OFApplicationDelegate> delegate; /*! * @brief The sandbox currently active for this application. */ @property OF_NULLABLE_PROPERTY (readonly, nonatomic) OFSandbox *activeSandbox; /*! * @brief Returns the only OFApplication instance in the application. * * @return The only OFApplication instance in the application */ + (nullable OFApplication *)sharedApplication; | > > > > > > > > > | 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 | /*! * @brief The delegate of the application. */ @property OF_NULLABLE_PROPERTY (assign, nonatomic) id <OFApplicationDelegate> delegate; #ifdef OF_HAVE_SANDBOX /*! * @brief The sandbox currently active for this application. */ @property OF_NULLABLE_PROPERTY (readonly, nonatomic) OFSandbox *activeSandbox; /*! * @brief The sandbox currently active for `exec()`'d processes of this * application. */ @property OF_NULLABLE_PROPERTY (readonly, nonatomic) OFSandbox *activeExecSandbox; #endif /*! * @brief Returns the only OFApplication instance in the application. * * @return The only OFApplication instance in the application */ + (nullable OFApplication *)sharedApplication; |
︙ | ︙ | |||
218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 | + (void)terminateWithStatus: (int)status OF_NO_RETURN; #ifdef OF_HAVE_SANDBOX /*! * @brief Activates the specified sandbox for the application. * * This is only available if `OF_HAVE_SANDBOX` is defined. * * @param sandbox The sandbox to activate */ + (void)activateSandbox: (OFSandbox *)sandbox; #endif - (instancetype)init OF_UNAVAILABLE; /*! * @brief Gets argc and argv. * | > > > > > > > > > > > > > > > > > | 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 | + (void)terminateWithStatus: (int)status OF_NO_RETURN; #ifdef OF_HAVE_SANDBOX /*! * @brief Activates the specified sandbox for the application. * * This is only available if `OF_HAVE_SANDBOX` is defined. * * @warning If you allow `exec()`, but do not call * @ref activateSandboxForExecdProcesses, an `exec()`'d process does not have * its permissions restricted! * * @param sandbox The sandbox to activate */ + (void)activateSandbox: (OFSandbox *)sandbox; /*! * @brief Activates the specified sandbox for `exec()`'d processes of the * application. * * This is only available if `OF_HAVE_SANDBOX` is defined. * * `unveiledPaths` on the sandbox must *not* be empty, otherwise an * @ref OFInvalidArgumentException is raised. * * @param sandbox The sandbox to activate */ + (void)activateSandboxForExecdProcesses: (OFSandbox *)sandbox; #endif - (instancetype)init OF_UNAVAILABLE; /*! * @brief Gets argc and argv. * |
︙ | ︙ | |||
252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 | - (void)terminateWithStatus: (int)status OF_NO_RETURN; #ifdef OF_HAVE_SANDBOX /*! * @brief Activates the specified sandbox for the application. * * This is only available if `OF_HAVE_SANDBOX` is defined. * * @param sandbox The sandbox to activate */ - (void)activateSandbox: (OFSandbox *)sandbox; #endif @end #ifdef __cplusplus extern "C" { #endif extern int of_application_main(int *_Nonnull, char *_Nullable *_Nonnull[_Nonnull], id <OFApplicationDelegate>); #ifdef __cplusplus } #endif OF_ASSUME_NONNULL_END | > > > > > > > > > > > > > > > > > | 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 | - (void)terminateWithStatus: (int)status OF_NO_RETURN; #ifdef OF_HAVE_SANDBOX /*! * @brief Activates the specified sandbox for the application. * * This is only available if `OF_HAVE_SANDBOX` is defined. * * @warning If you allow `exec()`, but do not call * @ref activateSandboxForExecdProcesses, an `exec()`'d process does not have * its permissions restricted! * * @param sandbox The sandbox to activate */ - (void)activateSandbox: (OFSandbox *)sandbox; /*! * @brief Activates the specified sandbox for `exec()`'d processes of the * application. * * This is only available if `OF_HAVE_SANDBOX` is defined. * * `unveiledPaths` on the sandbox must *not* be empty, otherwise an * @ref OFInvalidArgumentException is raised. * * @param sandbox The sandbox to activate */ - (void)activateSandboxForExecdProcesses: (OFSandbox *)sandbox; #endif @end #ifdef __cplusplus extern "C" { #endif extern int of_application_main(int *_Nonnull, char *_Nullable *_Nonnull[_Nonnull], id <OFApplicationDelegate>); #ifdef __cplusplus } #endif OF_ASSUME_NONNULL_END |
Modified src/OFApplication.m from [db83d4326f] to [e8c3d87532].
︙ | ︙ | |||
25 26 27 28 29 30 31 | #include <errno.h> #include <signal.h> #include "unistd_wrapper.h" #import "OFApplication.h" | < < < < < < < > > > > > > > > > | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 | #include <errno.h> #include <signal.h> #include "unistd_wrapper.h" #import "OFApplication.h" #import "OFArray.h" #import "OFDictionary.h" #ifdef OF_AMIGAOS # import "OFFile.h" # import "OFFileManager.h" #endif #import "OFLocale.h" #import "OFPair.h" #import "OFRunLoop+Private.h" #import "OFRunLoop.h" #import "OFSandbox.h" #import "OFString.h" #import "OFThread+Private.h" #import "OFThread.h" #import "OFInvalidArgumentException.h" #import "OFOutOfMemoryException.h" #import "OFOutOfRangeException.h" #import "OFSandboxActivationFailedException.h" #if defined(OF_MACOS) # include <crt_externs.h> #elif defined(OF_WINDOWS) |
︙ | ︙ | |||
152 153 154 155 156 157 158 | [delegate release]; return 0; } @implementation OFApplication @synthesize programName = _programName, arguments = _arguments; | | > > > > | 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 | [delegate release]; return 0; } @implementation OFApplication @synthesize programName = _programName, arguments = _arguments; @synthesize environment = _environment; #ifdef OF_HAVE_SANDBOX @synthesize activeSandbox = _activeSandbox; @synthesize activeExecSandbox = _activeExecSandbox; #endif + (OFApplication *)sharedApplication { return app; } + (OFString *)programName |
︙ | ︙ | |||
199 200 201 202 203 204 205 206 207 208 209 210 211 212 | } #ifdef OF_HAVE_SANDBOX + (void)activateSandbox: (OFSandbox *)sandbox { [app activateSandbox: sandbox]; } #endif - (instancetype)init { OF_INVALID_INIT_METHOD } | > > > > > | 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 | } #ifdef OF_HAVE_SANDBOX + (void)activateSandbox: (OFSandbox *)sandbox { [app activateSandbox: sandbox]; } + (void)activateSandboxForExecdProcesses: (OFSandbox *)sandbox { [app activateSandboxForExecdProcesses: sandbox]; } #endif - (instancetype)init { OF_INVALID_INIT_METHOD } |
︙ | ︙ | |||
579 580 581 582 583 584 585 586 | } #ifdef OF_HAVE_SANDBOX - (void)activateSandbox: (OFSandbox *)sandbox { # ifdef OF_HAVE_PLEDGE void *pool = objc_autoreleasePoolPush(); const char *promises = [[sandbox pledgeString] | > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 | } #ifdef OF_HAVE_SANDBOX - (void)activateSandbox: (OFSandbox *)sandbox { # ifdef OF_HAVE_PLEDGE void *pool = objc_autoreleasePoolPush(); of_string_encoding_t encoding = [OFLocale encoding]; const char *promises = [[sandbox pledgeString] cStringWithEncoding: encoding]; OFSandbox *oldSandbox; for (of_sandbox_unveil_path_t unveiledPath in [sandbox unveiledPaths]) { OFString *path = [unveiledPath firstObject]; OFString *permissions = [unveiledPath secondObject]; if (path == nil || permissions == nil) @throw [OFInvalidArgumentException exception]; unveil([path cStringWithEncoding: encoding], [permissions cStringWithEncoding: encoding]); } if (pledge(promises, NULL) != 0) @throw [OFSandboxActivationFailedException exceptionWithSandbox: sandbox errNo: errno]; objc_autoreleasePoolPop(pool); oldSandbox = _activeSandbox; _activeSandbox = [sandbox retain]; [oldSandbox release]; # endif } - (void)activateSandboxForExecdProcesses: (OFSandbox *)sandbox { # ifdef OF_HAVE_PLEDGE void *pool = objc_autoreleasePoolPush(); const char *promises = [[sandbox pledgeString] cStringWithEncoding: [OFLocale encoding]]; OFSandbox *oldSandbox; if ([[sandbox unveiledPaths] count] != 0) @throw [OFInvalidArgumentException exception]; if (pledge(NULL, promises) != 0) @throw [OFSandboxActivationFailedException exceptionWithSandbox: sandbox errNo: errno]; objc_autoreleasePoolPop(pool); oldSandbox = _activeExecSandbox; _activeExecSandbox = [sandbox retain]; [oldSandbox release]; # endif } #endif @end |
Modified src/OFSandbox.h from [f0eb5fcbac] to [814bcfc2f4].
︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFObject.h" OF_ASSUME_NONNULL_BEGIN @class OFArray OF_GENERIC(ObjectType); /*! * @class OFSandbox OFSandbox.h ObjFW/OFSandbox.h * * @brief A class which describes a sandbox for the application. */ @interface OFSandbox: OFObject <OFCopying> | > > > > > > > > > > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFObject.h" OF_ASSUME_NONNULL_BEGIN /*! @file */ @class OFArray OF_GENERIC(ObjectType); @class OFMutableArray OF_GENERIC(ObjectType); @class OFPair OF_GENERIC(FirstType, SecondType); /*! * @brief An @ref OFPair for a path to unveil, with the first string being the * path and the second the permissions. */ typedef OFPair OF_GENERIC(OFString *, OFString *) *of_sandbox_unveil_path_t; /*! * @class OFSandbox OFSandbox.h ObjFW/OFSandbox.h * * @brief A class which describes a sandbox for the application. */ @interface OFSandbox: OFObject <OFCopying> |
︙ | ︙ | |||
52 53 54 55 56 57 58 59 60 61 62 63 64 65 | unsigned int _allowsSetTime: 1; unsigned int _allowsPS: 1; unsigned int _allowsVMInfo: 1; unsigned int _allowsChangingProcessRights: 1; unsigned int _allowsPF: 1; unsigned int _allowsAudio: 1; unsigned int _allowsBPF: 1; } /*! * @brief Allows IO operations on previously allocated file descriptors. */ @property (nonatomic) bool allowsStdIO; | > > > | 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 | unsigned int _allowsSetTime: 1; unsigned int _allowsPS: 1; unsigned int _allowsVMInfo: 1; unsigned int _allowsChangingProcessRights: 1; unsigned int _allowsPF: 1; unsigned int _allowsAudio: 1; unsigned int _allowsBPF: 1; unsigned int _allowsUnveil: 1; unsigned int _returnsErrors: 1; OFMutableArray OF_GENERIC(of_sandbox_unveil_path_t) *_unveiledPaths; } /*! * @brief Allows IO operations on previously allocated file descriptors. */ @property (nonatomic) bool allowsStdIO; |
︙ | ︙ | |||
194 195 196 197 198 199 200 201 | @property (nonatomic) bool allowsAudio; /*! * @brief Allows BIOCGSTATS to collect statistics from a BPF device. */ @property (nonatomic) bool allowsBPF; /*! | | > | > > > > | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 | @property (nonatomic) bool allowsAudio; /*! * @brief Allows BIOCGSTATS to collect statistics from a BPF device. */ @property (nonatomic) bool allowsBPF; /*! * @brief Allows unveiling more paths. */ @property (nonatomic) bool allowsUnveil; /*! * @brief Returns errors instead of killing the process. */ @property (nonatomic) bool returnsErrors; #ifdef OF_HAVE_PLEDGE /*! * The string for OpenBSD's pledge() call. * * @warning Only available on systems with the pledge() call! */ @property (readonly, nonatomic) OFString *pledgeString; #endif /*! * @brief A list of unveiled paths. */ @property (readonly, nonatomic) OFArray OF_GENERIC(of_sandbox_unveil_path_t) *unveiledPaths; /*! * @brief Create a new, autorelease OFSandbox. */ + (instancetype)sandbox; /*! * @brief "Unveils" the specified path, meaning that it becomes visible from * the sandbox with the specified permissions. * * @param path The path to unveil * @param permissions The permissions for the path. The following permissions * can be combined: * Permission | Description * -----------|-------------------- * r | Make the path available for reading, like * | @ref allowsReadingFiles * w | Make the path available for writing, like * | @ref allowsWritingFiles * x | Make the path available for executing, like * | @ref allowsExec * c | Make the path available for creation and * | deletion, like @ref allowsCreatingFiles */ - (void)unveilPath: (OFString *)path permissions: (OFString *)permissions; @end OF_ASSUME_NONNULL_END |
Modified src/OFSandbox.m from [96a0d71157] to [beb1d8bb3f].
︙ | ︙ | |||
14 15 16 17 18 19 20 | * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #import "OFSandbox.h" | | | > > > > > > > > > > > > > > > > > > > > > > > > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 | * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #import "OFSandbox.h" #import "OFArray.h" #import "OFPair.h" #import "OFString.h" @implementation OFSandbox @synthesize unveiledPaths = _unveiledPaths; + (instancetype)sandbox { return [[[self alloc] init] autorelease]; } - (instancetype)init { self = [super init]; @try { _unveiledPaths = [[OFMutableArray alloc] init]; } @catch (id e) { [self release]; @throw e; } return self; } - (void)dealloc { [_unveiledPaths release]; [super dealloc]; } - (void)setAllowsStdIO: (bool)allowsStdIO { _allowsStdIO = allowsStdIO; } - (bool)allowsStdIO |
︙ | ︙ | |||
302 303 304 305 306 307 308 309 310 311 312 313 314 315 | _allowsBPF = allowsBPF; } - (bool)allowsBPF { return _allowsBPF; } - (id)copy { OFSandbox *copy = [[OFSandbox alloc] init]; copy->_allowsStdIO = _allowsStdIO; copy->_allowsReadingFiles = _allowsReadingFiles; | > > > > > > > > > > > > > > > > > > > > | 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 | _allowsBPF = allowsBPF; } - (bool)allowsBPF { return _allowsBPF; } - (void)setAllowsUnveil: (bool)allowsUnveil { _allowsUnveil = allowsUnveil; } - (bool)allowsUnveil { return _allowsUnveil; } - (void)setReturnsErrors: (bool)returnsErrors { _returnsErrors = returnsErrors; } - (bool)returnsErrors { return _returnsErrors; } - (id)copy { OFSandbox *copy = [[OFSandbox alloc] init]; copy->_allowsStdIO = _allowsStdIO; copy->_allowsReadingFiles = _allowsReadingFiles; |
︙ | ︙ | |||
335 336 337 338 339 340 341 342 343 344 345 346 347 348 | copy->_allowsSetTime = _allowsSetTime; copy->_allowsPS = _allowsPS; copy->_allowsVMInfo = _allowsVMInfo; copy->_allowsChangingProcessRights = _allowsChangingProcessRights; copy->_allowsPF = _allowsPF; copy->_allowsAudio = _allowsAudio; copy->_allowsBPF = _allowsBPF; return copy; } - (bool)isEqual: (id)object { OFSandbox *sandbox; | > > | 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 | copy->_allowsSetTime = _allowsSetTime; copy->_allowsPS = _allowsPS; copy->_allowsVMInfo = _allowsVMInfo; copy->_allowsChangingProcessRights = _allowsChangingProcessRights; copy->_allowsPF = _allowsPF; copy->_allowsAudio = _allowsAudio; copy->_allowsBPF = _allowsBPF; copy->_allowsUnveil = _allowsUnveil; copy->_returnsErrors = _returnsErrors; return copy; } - (bool)isEqual: (id)object { OFSandbox *sandbox; |
︙ | ︙ | |||
411 412 413 414 415 416 417 418 419 420 421 422 423 424 | return false; if (sandbox->_allowsPF != _allowsPF) return false; if (sandbox->_allowsAudio != _allowsAudio) return false; if (sandbox->_allowsBPF != _allowsBPF) return false; return true; } - (uint32_t)hash { uint32_t hash; | > > > > | 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 | return false; if (sandbox->_allowsPF != _allowsPF) return false; if (sandbox->_allowsAudio != _allowsAudio) return false; if (sandbox->_allowsBPF != _allowsBPF) return false; if (sandbox->_allowsUnveil != _allowsUnveil) return false; if (sandbox->_returnsErrors != _returnsErrors) return false; return true; } - (uint32_t)hash { uint32_t hash; |
︙ | ︙ | |||
449 450 451 452 453 454 455 456 457 458 459 460 461 462 | OF_HASH_ADD(hash, _allowsSetTime); OF_HASH_ADD(hash, _allowsPS); OF_HASH_ADD(hash, _allowsVMInfo); OF_HASH_ADD(hash, _allowsChangingProcessRights); OF_HASH_ADD(hash, _allowsPF); OF_HASH_ADD(hash, _allowsAudio); OF_HASH_ADD(hash, _allowsBPF); OF_HASH_FINALIZE(hash); return hash; } #ifdef OF_HAVE_PLEDGE | > > | 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 | OF_HASH_ADD(hash, _allowsSetTime); OF_HASH_ADD(hash, _allowsPS); OF_HASH_ADD(hash, _allowsVMInfo); OF_HASH_ADD(hash, _allowsChangingProcessRights); OF_HASH_ADD(hash, _allowsPF); OF_HASH_ADD(hash, _allowsAudio); OF_HASH_ADD(hash, _allowsBPF); OF_HASH_ADD(hash, _allowsUnveil); OF_HASH_ADD(hash, _returnsErrors); OF_HASH_FINALIZE(hash); return hash; } #ifdef OF_HAVE_PLEDGE |
︙ | ︙ | |||
518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 | [pledges addObject: @"id"]; if (_allowsPF) [pledges addObject: @"pf"]; if (_allowsAudio) [pledges addObject: @"audio"]; if (_allowsBPF) [pledges addObject: @"bpf"]; ret = [pledges componentsJoinedByString: @" "]; [ret retain]; objc_autoreleasePoolPop(pool); return [ret autorelease]; } #endif @end | > > > > > > > > > > > > > > > > > > > > | 570 571 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 | [pledges addObject: @"id"]; if (_allowsPF) [pledges addObject: @"pf"]; if (_allowsAudio) [pledges addObject: @"audio"]; if (_allowsBPF) [pledges addObject: @"bpf"]; if (_allowsUnveil) [pledges addObject: @"unveil"]; if (_returnsErrors) [pledges addObject: @"error"]; ret = [pledges componentsJoinedByString: @" "]; [ret retain]; objc_autoreleasePoolPop(pool); return [ret autorelease]; } #endif - (void)unveilPath: (OFString *)path permissions: (OFString *)permissions { void *pool = objc_autoreleasePoolPush(); [_unveiledPaths addObject: [OFPair pairWithFirstObject: path secondObject: permissions]]; objc_autoreleasePoolPop(pool); } - (OFArray OF_GENERIC(of_sandbox_unveil_path_t) *)unveiledPaths { return [[_unveiledPaths copy] autorelease]; } @end |