-
Notifications
You must be signed in to change notification settings - Fork 510
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix Guard bypass in Eloquent models in laravel/framework
- Loading branch information
1 parent
1e87181
commit 21d8632
Showing
5 changed files
with
481 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
226 changes: 226 additions & 0 deletions
226
overrides/laravel/framework/src/Illuminate/Database/Eloquent/Concerns/GuardsAttributes.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,226 @@ | ||
| <?php | ||
|
|
||
| namespace Illuminate\Database\Eloquent\Concerns; | ||
|
|
||
| use Illuminate\Support\Str; | ||
|
|
||
| trait GuardsAttributes | ||
| { | ||
| /** | ||
| * The attributes that are mass assignable. | ||
| * | ||
| * @var array | ||
| */ | ||
| protected $fillable = []; | ||
|
|
||
| /** | ||
| * The attributes that aren't mass assignable. | ||
| * | ||
| * @var array | ||
| */ | ||
| protected $guarded = ['*']; | ||
|
|
||
| /** | ||
| * Indicates if all mass assignment is enabled. | ||
| * | ||
| * @var bool | ||
| */ | ||
| protected static $unguarded = false; | ||
|
|
||
| /** | ||
| * The actual columns that exist on the database and can be guarded. | ||
| * | ||
| * @var array | ||
| */ | ||
| protected static $guardableColumns = []; | ||
|
|
||
| /** | ||
| * Get the fillable attributes for the model. | ||
| * | ||
| * @return array | ||
| */ | ||
| public function getFillable() | ||
| { | ||
| return $this->fillable; | ||
| } | ||
|
|
||
| /** | ||
| * Set the fillable attributes for the model. | ||
| * | ||
| * @param array $fillable | ||
| * @return $this | ||
| */ | ||
| public function fillable(array $fillable) | ||
| { | ||
| $this->fillable = $fillable; | ||
|
|
||
| return $this; | ||
| } | ||
|
|
||
| /** | ||
| * Get the guarded attributes for the model. | ||
| * | ||
| * @return array | ||
| */ | ||
| public function getGuarded() | ||
| { | ||
| return $this->guarded; | ||
| } | ||
|
|
||
| /** | ||
| * Set the guarded attributes for the model. | ||
| * | ||
| * @param array $guarded | ||
| * @return $this | ||
| */ | ||
| public function guard(array $guarded) | ||
| { | ||
| $this->guarded = $guarded; | ||
|
|
||
| return $this; | ||
| } | ||
|
|
||
| /** | ||
| * Disable all mass assignable restrictions. | ||
| * | ||
| * @param bool $state | ||
| * @return void | ||
| */ | ||
| public static function unguard($state = true) | ||
| { | ||
| static::$unguarded = $state; | ||
| } | ||
|
|
||
| /** | ||
| * Enable the mass assignment restrictions. | ||
| * | ||
| * @return void | ||
| */ | ||
| public static function reguard() | ||
| { | ||
| static::$unguarded = false; | ||
| } | ||
|
|
||
| /** | ||
| * Determine if current state is "unguarded". | ||
| * | ||
| * @return bool | ||
| */ | ||
| public static function isUnguarded() | ||
| { | ||
| return static::$unguarded; | ||
| } | ||
|
|
||
| /** | ||
| * Run the given callable while being unguarded. | ||
| * | ||
| * @param callable $callback | ||
| * @return mixed | ||
| */ | ||
| public static function unguarded(callable $callback) | ||
| { | ||
| if (static::$unguarded) { | ||
| return $callback(); | ||
| } | ||
|
|
||
| static::unguard(); | ||
|
|
||
| try { | ||
| return $callback(); | ||
| } finally { | ||
| static::reguard(); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Determine if the given attribute may be mass assigned. | ||
| * | ||
| * @param string $key | ||
| * @return bool | ||
| */ | ||
| public function isFillable($key) | ||
| { | ||
| if (static::$unguarded) { | ||
| return true; | ||
| } | ||
|
|
||
| // If the key is in the "fillable" array, we can of course assume that it's | ||
| // a fillable attribute. Otherwise, we will check the guarded array when | ||
| // we need to determine if the attribute is black-listed on the model. | ||
| if (in_array($key, $this->getFillable())) { | ||
| return true; | ||
| } | ||
|
|
||
| // If the attribute is explicitly listed in the "guarded" array then we can | ||
| // return false immediately. This means this attribute is definitely not | ||
| // fillable and there is no point in going any further in this method. | ||
| if ($this->isGuarded($key)) { | ||
| return false; | ||
| } | ||
|
|
||
| return empty($this->getFillable()) && | ||
| strpos($key, '.') === false && | ||
| ! Str::startsWith($key, '_'); | ||
| } | ||
|
|
||
| /** | ||
| * Determine if the given key is guarded. | ||
| * | ||
| * @param string $key | ||
| * @return bool | ||
| */ | ||
| public function isGuarded($key) | ||
| { | ||
| //return in_array($key, $this->getGuarded()) || $this->getGuarded() == ['*']; | ||
|
|
||
| if (empty($this->getGuarded())) { | ||
| return false; | ||
| } | ||
|
|
||
| return $this->getGuarded() == ['*'] || | ||
| ! empty(preg_grep('/^'.preg_quote($key).'$/i', $this->getGuarded())) || | ||
| ! $this->isGuardableColumn($key); | ||
| } | ||
|
|
||
| /** | ||
| * Determine if the given column is a valid, guardable column. | ||
| * | ||
| * @param string $key | ||
| * @return bool | ||
| */ | ||
| protected function isGuardableColumn($key) | ||
| { | ||
| if (! isset(static::$guardableColumns[get_class($this)])) { | ||
| static::$guardableColumns[get_class($this)] = $this->getConnection() | ||
| ->getSchemaBuilder() | ||
| ->getColumnListing($this->getTable()); | ||
| } | ||
|
|
||
| return in_array($key, static::$guardableColumns[get_class($this)]); | ||
| } | ||
|
|
||
| /** | ||
| * Determine if the model is totally guarded. | ||
| * | ||
| * @return bool | ||
| */ | ||
| public function totallyGuarded() | ||
| { | ||
| return count($this->getFillable()) == 0 && $this->getGuarded() == ['*']; | ||
| } | ||
|
|
||
| /** | ||
| * Get the fillable attributes of a given array. | ||
| * | ||
| * @param array $attributes | ||
| * @return array | ||
| */ | ||
| protected function fillableFromArray(array $attributes) | ||
| { | ||
| if (count($this->getFillable()) > 0 && ! static::$unguarded) { | ||
| return array_intersect_key($attributes, array_flip($this->getFillable())); | ||
| } | ||
|
|
||
| return $attributes; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.