Changed data column type from text to blob to handle null-byte …

…(`\0`) in serialized RBAC rule properly Closes #12681
yiisoft · Nov 12, 2016 · 2379027 · SilverFire · Nov 12, 2016 · 2379027
1 parent a246b1b
commit 2379027
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 14 deletions.
diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
@@ -84,6 +84,8 @@ Yii Framework 2 Change Log
 - Bug #12605: Make 'safe' validator work on write-only properties (arthibald, CeBe)
 - Bug #12629: Fixed `yii\widgets\ActiveField::widget()` to call `adjustLabelFor()` for `InputWidget` descendants (coderlex)
 - Bug #12649: Fixed consistency of `indexBy` handling for `yii\db\Query::column()` (silverfire)
+- Bug #11921: Fixed URL decoding in `yii.getQueryParams()` to handle `+` (plus) character properly (silverfire)
+- Bug #12681: Changed `data` column type from `text` to `blob` to handle null-byte (`\0`) in serialized RBAC rule properly (silverfire)
 - Enh #384: Added ability to run migration from several locations via `yii\console\controllers\BaseMigrateController::$migrationNamespaces` (klimov-paul)
 - Enh #6996: Added `yii\web\MultipartFormDataParser`, which allows proper processing of 'multipart/form-data' encoded non POST requests (klimov-paul)
 - Enh #8719: Add support for HTML5 attributes on submitbutton (formaction/formmethod...) for ActiveForm (VirtualRJ)

diff --git a/framework/rbac/migrations/m140506_102106_rbac_init.php b/framework/rbac/migrations/m140506_102106_rbac_init.php
@@ -53,7 +53,7 @@ public function up()
 
         $this->createTable($authManager->ruleTable, [
             'name' => $this->string(64)->notNull(),
-            'data' => $this->text(),
+            'data' => $this->binary(),
             'created_at' => $this->integer(),
             'updated_at' => $this->integer(),
             'PRIMARY KEY (name)',
@@ -64,7 +64,7 @@ public function up()
             'type' => $this->smallInteger()->notNull(),
             'description' => $this->text(),
             'rule_name' => $this->string(64),
-            'data' => $this->text(),
+            'data' => $this->binary(),
             'created_at' => $this->integer(),
             'updated_at' => $this->integer(),
             'PRIMARY KEY (name)',

diff --git a/framework/rbac/migrations/schema-mssql.sql b/framework/rbac/migrations/schema-mssql.sql
@@ -17,7 +17,7 @@ drop table [auth_rule];
 create table [auth_rule]
 (
     [name]  varchar(64) not null,
-    [data]  text,
+    [data]  blob,
     [created_at]           integer,
     [updated_at]           integer,
     primary key ([name])
@@ -29,7 +29,7 @@ create table [auth_item]
    [type]                 smallint not null,
    [description]          text,
    [rule_name]            varchar(64),
-   [data]                 text,
+   [data]                 blob,
    [created_at]           integer,
    [updated_at]           integer,
    primary key ([name]),
@@ -89,4 +89,4 @@ CREATE TRIGGER dbo.trigger_auth_item_child
                         DELETE FROM dbo.[auth_item_child] WHERE parent IN (SELECT name FROM deleted) OR child IN (SELECT name FROM deleted);
                         DELETE FROM dbo.[auth_item] WHERE name IN (SELECT name FROM deleted);
                     END
-        END;
+        END;
diff --git a/framework/rbac/migrations/schema-mysql.sql b/framework/rbac/migrations/schema-mysql.sql
@@ -17,7 +17,7 @@ drop table if exists `auth_rule`;
 create table `auth_rule`
 (
    `name`                 varchar(64) not null,
-   `data`                 text,
+   `data`                 blob,
    `created_at`           integer,
    `updated_at`           integer,
     primary key (`name`)
@@ -29,7 +29,7 @@ create table `auth_item`
    `type`                 smallint not null,
    `description`          text,
    `rule_name`            varchar(64),
-   `data`                 text,
+   `data`                 blob,
    `created_at`           integer,
    `updated_at`           integer,
    primary key (`name`),

diff --git a/framework/rbac/migrations/schema-oci.sql b/framework/rbac/migrations/schema-oci.sql
@@ -18,7 +18,7 @@ drop table "auth_rule";
 create table "auth_rule"
 (
    "name"  varchar(64) not null,
-   "data"  varchar(1000),
+   "data"  BYTEA,
    "created_at"           integer,
    "updated_at"           integer,
     primary key ("name")
@@ -31,8 +31,7 @@ create table "auth_item"
    "type"                 smallint not null,
    "description"          varchar(1000),
    "rule_name"            varchar(64),
-   "data"                 varchar(1000),
-   "created_at"           integer,
+   "data"                 BYTEA,
    "updated_at"           integer,
         foreign key ("rule_name") references "auth_rule"("name") on delete set null,
         primary key ("name")

diff --git a/framework/rbac/migrations/schema-pgsql.sql b/framework/rbac/migrations/schema-pgsql.sql
@@ -17,7 +17,7 @@ drop table if exists "auth_rule";
 create table "auth_rule"
 (
     "name"  varchar(64) not null,
-    "data"  text,
+    "data"  bytea,
     "created_at"           integer,
     "updated_at"           integer,
     primary key ("name")
@@ -29,7 +29,7 @@ create table "auth_item"
    "type"                 smallint not null,
    "description"          text,
    "rule_name"            varchar(64),
-   "data"                 text,
+   "data"                 bytea,
    "created_at"           integer,
    "updated_at"           integer,
    primary key ("name"),

diff --git a/framework/rbac/migrations/schema-sqlite.sql b/framework/rbac/migrations/schema-sqlite.sql
@@ -17,7 +17,7 @@ drop table if exists "auth_rule";
 create table "auth_rule"
 (
     "name"  varchar(64) not null,
-    "data"  text,
+    "data"  blob,
     "created_at"           integer,
     "updated_at"           integer,
     primary key ("name")
@@ -29,7 +29,7 @@ create table "auth_item"
    "type"                 smallint not null,
    "description"          text,
    "rule_name"            varchar(64),
-   "data"                 text,
+   "data"                 blob,
    "created_at"           integer,
    "updated_at"           integer,
    primary key ("name"),