kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-06 12:45:30 +00:00
Code Issues Projects Releases Wiki Activity

Updated models for encryption.

Browse Source
This commit is contained in:
James Cole
2015-05-23 08:46:46 +02:00
parent 1c2cbd5b40
commit f05002c729
10 changed files with 221 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Models/Account.php
View File

@@ -145,9 +145,7 @@ class Account extends Model
return Crypt::decrypt($value);
}
// @codeCoverageIgnoreStart
return $value;
// @codeCoverageIgnoreEnd
}
@@ -228,7 +226,7 @@ class Account extends Model
// save in cents:
$value = intval($value * 100);
$this->attributes['virtual_balance_encrypted'] = Crypt::encrypt($value);
$this->attributes['virtual_balance'] = 0;
$this->attributes['virtual_balance'] = ($value / 100);
}
/**

4
app/Models/Bill.php
View File

@@ -96,7 +96,7 @@ class Bill extends Model
// save in cents:
$value = intval($value * 100);
$this->attributes['amount_max_encrypted'] = Crypt::encrypt($value);
$this->attributes['amount_max'] = 0;
$this->attributes['amount_max'] = ($value / 100);
}
/**
@@ -107,7 +107,7 @@ class Bill extends Model
// save in cents:
$value = intval($value * 100);
$this->attributes['amount_min_encrypted'] = Crypt::encrypt($value);
$this->attributes['amount_min'] = 0;
$this->attributes['amount_min'] = ($value / 100);
}
/**

28
app/Models/BudgetLimit.php
View File

@@ -1,5 +1,6 @@
<?php namespace FireflyIII\Models;
use Crypt;
use Illuminate\Database\Eloquent\Model;
/**
@@ -19,6 +20,22 @@ class BudgetLimit extends Model
return $this->belongsTo('FireflyIII\Models\Budget');
}
/**
* @param $value
*
* @return float|int
*/
public function getAmountAttribute($value)
{
if (is_null($this->amount_encrypted)) {
return $value;
}
$value = intval(Crypt::decrypt($this->amount_encrypted));
$value = $value / 100;
return $value;
}
/**
* @return array
*/
@@ -35,4 +52,15 @@ class BudgetLimit extends Model
return $this->hasMany('FireflyIII\Models\LimitRepetition');
}
/**
* @param $value
*/
public function setAmountAttribute($value)
{
// save in cents:
$value = intval($value * 100);
$this->attributes['amount_encrypted'] = Crypt::encrypt($value);
$this->attributes['amount'] = ($value / 100);
}
}

28
app/Models/LimitRepetition.php
View File

@@ -1,6 +1,7 @@
<?php namespace FireflyIII\Models;
use Auth;
use Crypt;
use DB;
use Illuminate\Database\Eloquent\Model;
@@ -51,4 +52,31 @@ class LimitRepetition extends Model
return floatval($sum);
}
/**
* @param $value
*
* @return float|int
*/
public function getAmountAttribute($value)
{
if (is_null($this->amount_encrypted)) {
return $value;
}
$value = intval(Crypt::decrypt($this->amount_encrypted));
$value = $value / 100;
return $value;
}
/**
* @param $value
*/
public function setAmountAttribute($value)
{
// save in cents:
$value = intval($value * 100);
$this->attributes['amount_encrypted'] = Crypt::encrypt($value);
$this->attributes['amount'] = ($value / 100);
}
}

53
app/Models/PiggyBank.php
View File

@@ -62,6 +62,25 @@ class PiggyBank extends Model
return ['created_at', 'updated_at', 'deleted_at', 'startdate', 'targetdate'];
}
/**
* @codeCoverageIgnore
*
* @param $value
*
* @return string
*/
public function getNameAttribute($value)
{
if (intval($this->encrypted) == 1) {
return Crypt::decrypt($value);
}
// @codeCoverageIgnoreStart
return $value;
// @codeCoverageIgnoreEnd
}
/**
* @codeCoverageIgnore
*
@@ -74,6 +93,22 @@ class PiggyBank extends Model
return intval($value) == 1;
}
/**
* @param $value
*
* @return float|int
*/
public function getTargetamountAttribute($value)
{
if (is_null($this->targetamount_encrypted)) {
return $value;
}
$value = intval(Crypt::decrypt($this->targetamount_encrypted));
$value = $value / 100;
return $value;
}
/**
* @codeCoverageIgnore
* @return \Illuminate\Database\Eloquent\Relations\HasMany
@@ -104,21 +139,13 @@ class PiggyBank extends Model
}
/**
* @codeCoverageIgnore
*
* @param $value
*
* @return string
*/
public function getNameAttribute($value)
public function setTargetamountAttribute($value)
{
if (intval($this->encrypted) == 1) {
return Crypt::decrypt($value);
}
// @codeCoverageIgnoreStart
return $value;
// @codeCoverageIgnoreEnd
// save in cents:
$value = intval($value * 100);
$this->attributes['targetamount_encrypted'] = Crypt::encrypt($value);
$this->attributes['targetamount'] = ($value / 100);
}
}

28
app/Models/PiggyBankEvent.php
View File

@@ -1,5 +1,6 @@
<?php namespace FireflyIII\Models;
use Crypt;
use Illuminate\Database\Eloquent\Model;
/**
@@ -13,6 +14,22 @@ class PiggyBankEvent extends Model
protected $fillable = ['piggy_bank_id', 'transaction_journal_id', 'date', 'amount'];
/**
* @param $value
*
* @return float|int
*/
public function getAmountAttribute($value)
{
if (is_null($this->amount_encrypted)) {
return $value;
}
$value = intval(Crypt::decrypt($this->amount_encrypted));
$value = $value / 100;
return $value;
}
/**
* @return array
*/
@@ -29,6 +46,17 @@ class PiggyBankEvent extends Model
return $this->belongsTo('FireflyIII\Models\PiggyBank');
}
/**
* @param $value
*/
public function setAmountAttribute($value)
{
// save in cents:
$value = intval($value * 100);
$this->attributes['amount_encrypted'] = Crypt::encrypt($value);
$this->attributes['amount'] = ($value / 100);
}
/**
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/

28
app/Models/PiggyBankRepetition.php
View File

@@ -1,6 +1,7 @@
<?php namespace FireflyIII\Models;
use Carbon\Carbon;
use Crypt;
use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
use Illuminate\Database\Eloquent\Model;
@@ -66,4 +67,31 @@ class PiggyBankRepetition extends Model
);
}
/**
* @param $value
*
* @return float|int
*/
public function getCurrentamountAttribute($value)
{
if (is_null($this->currentamount_encrypted)) {
return $value;
}
$value = intval(Crypt::decrypt($this->currentamount_encrypted));
$value = $value / 100;
return $value;
}
/**
* @param $value
*/
public function setCurrentamountAttribute($value)
{
// save in cents:
$value = intval($value * 100);
$this->attributes['currentamount_encrypted'] = Crypt::encrypt($value);
$this->attributes['currentamount'] = ($value / 100);
}
}

33
app/Models/Preference.php
View File

@@ -1,5 +1,6 @@
<?php namespace FireflyIII\Models;
use Crypt;
use Illuminate\Database\Eloquent\Model;
/**
@@ -20,8 +21,13 @@ class Preference extends Model
*/
public function getDataAttribute($value)
{
if (is_null($this->data_encrypted)) {
return json_decode($value);
}
$data = Crypt::decrypt($this->data_encrypted);
return json_decode($data);
}
/**
* @return array
@@ -31,12 +37,37 @@ class Preference extends Model
return ['created_at', 'updated_at'];
}
/**
* @param $value
*
* @return float|int
*/
public function getNameAttribute($value)
{
if (is_null($this->name_encrypted)) {
return $value;
}
$value = Crypt::decrypt($this->name_encrypted);
return $value;
}
/**
* @param $value
*/
public function setDataAttribute($value)
{
$this->attributes['data'] = json_encode($value);
$this->attributes['data'] = '';//json_encode($value);
$this->attributes['data_encrypted'] = Crypt::encrypt(json_encode($value));
}
/**
* @param $value
*/
public function setNameAttribute($value)
{
$this->attributes['name_encrypted'] = Crypt::encrypt($value);
$this->attributes['name'] = $value;
}
/**

34
app/Models/Transaction.php
View File

@@ -1,6 +1,7 @@
<?php namespace FireflyIII\Models;
use Carbon\Carbon;
use Crypt;
use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
@@ -33,6 +34,30 @@ class Transaction extends Model
return $this->belongsTo('FireflyIII\Models\Account');
}
/**
* @param $value
*
* @return float|int
*/
public function getAmountAttribute($value)
{
if (is_null($this->amount_encrypted)) {
return $value;
}
$value = intval(Crypt::decrypt($this->amount_encrypted));
$value = $value / 100;
return $value;
}
/**
* @return array
*/
public function getDates()
{
return ['created_at', 'updated_at', 'deleted_at'];
}
/**
* @param EloquentBuilder $query
* @param Carbon $date
@@ -56,11 +81,14 @@ class Transaction extends Model
}
/**
* @return array
* @param $value
*/
public function getDates()
public function setAmountAttribute($value)
{
return ['created_at', 'updated_at', 'deleted_at'];
// save in cents:
$value = intval($value * 100);
$this->attributes['amount_encrypted'] = Crypt::encrypt($value);
$this->attributes['amount'] = ($value / 100);
}
/**

4
database/migrations/2015_05_22_172026_changes_for_v3409.php
View File

@@ -131,8 +131,8 @@ class ChangesForV3409 extends Migration
// encrypt preference data (add field)
Schema::table(
'preferences', function (Blueprint $table) {
$table->smallInteger('name_encrypted', false, true)->default(0)->after('name');
$table->smallInteger('data_encrypted', false, true)->default(0)->after('data');
$table->text('name_encrypted')->nullable()->after('name');
$table->text('data_encrypted')->nullable()->after('data');
}
);