projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't look up encryption config every record, RT#28526
[freeside.git]
/
FS
/
FS
/
Record.pm
diff --git
a/FS/FS/Record.pm
b/FS/FS/Record.pm
index
fd5f297
..
ec0ba14
100644
(file)
--- a/
FS/FS/Record.pm
+++ b/
FS/FS/Record.pm
@@
-3,7
+3,7
@@
package FS::Record;
use strict;
use vars qw( $AUTOLOAD @ISA @EXPORT_OK $DEBUG
%virtual_fields_cache
use strict;
use vars qw( $AUTOLOAD @ISA @EXPORT_OK $DEBUG
%virtual_fields_cache
- $
conf $conf_encryption $
money_char $lat_lower $lon_upper
+ $money_char $lat_lower $lon_upper
$me
$nowarn_identical $nowarn_classload
$no_update_diff $no_history $qsearch_qualify_columns
$me
$nowarn_identical $nowarn_classload
$no_update_diff $no_history $qsearch_qualify_columns
@@
-61,14
+61,20
@@
my $rsa_loaded;
my $rsa_encrypt;
my $rsa_decrypt;
my $rsa_encrypt;
my $rsa_decrypt;
-$conf = '';
-$conf_encryption = '';
+our $conf = '';
+our $conf_encryption = '';
+our $conf_encryptionmodule = '';
+our $conf_encryptionpublickey = '';
+our $conf_encryptionprivatekey = '';
FS::UID->install_callback( sub {
eval "use FS::Conf;";
die $@ if $@;
$conf = FS::Conf->new;
FS::UID->install_callback( sub {
eval "use FS::Conf;";
die $@ if $@;
$conf = FS::Conf->new;
- $conf_encryption = $conf->exists('encryption');
+ $conf_encryption = $conf->exists('encryption');
+ $conf_encryptionmodule = $conf->exists('encryptionmodule');
+ $conf_encryptionpublickey = $conf->exists('encryptionpublickey');
+ $conf_encryptionprivatekey = $conf->exists('encryptionprivatekey');
$money_char = $conf->config('money_char') || '$';
my $nw_coords = $conf->exists('geocode-require_nw_coordinates');
$lat_lower = $nw_coords ? 1 : -90;
$money_char = $conf->config('money_char') || '$';
my $nw_coords = $conf->exists('geocode-require_nw_coordinates');
$lat_lower = $nw_coords ? 1 : -90;
@@
-1158,7
+1164,7
@@
sub insert {
# Encrypt before the database
if ( defined(eval '@FS::'. $table . '::encrypted_fields')
&& scalar( eval '@FS::'. $table . '::encrypted_fields')
# Encrypt before the database
if ( defined(eval '@FS::'. $table . '::encrypted_fields')
&& scalar( eval '@FS::'. $table . '::encrypted_fields')
- && $conf
->exists('encryption')
+ && $conf
_encryption
) {
foreach my $field (eval '@FS::'. $table . '::encrypted_fields') {
next if $field eq 'payinfo'
) {
foreach my $field (eval '@FS::'. $table . '::encrypted_fields') {
next if $field eq 'payinfo'
@@
-1399,7
+1405,7
@@
sub replace {
# Encrypt for replace
my $saved = {};
# Encrypt for replace
my $saved = {};
- if ( $conf
->exists('encryption')
+ if ( $conf
_encryption
&& defined(eval '@FS::'. $new->table . '::encrypted_fields')
&& scalar( eval '@FS::'. $new->table . '::encrypted_fields')
) {
&& defined(eval '@FS::'. $new->table . '::encrypted_fields')
&& scalar( eval '@FS::'. $new->table . '::encrypted_fields')
) {
@@
-1686,6
+1692,7
@@
sub process_batch_import {
format_xml_formats => $opt->{format_xml_formats},
format_asn_formats => $opt->{format_asn_formats},
format_row_callbacks => $opt->{format_row_callbacks},
format_xml_formats => $opt->{format_xml_formats},
format_asn_formats => $opt->{format_asn_formats},
format_row_callbacks => $opt->{format_row_callbacks},
+ format_hash_callbacks => $opt->{format_hash_callbacks},
#per-import
job => $job,
file => $file,
#per-import
job => $job,
file => $file,
@@
-1694,7
+1701,9
@@
sub process_batch_import {
params => { map { $_ => $param->{$_} } @pass_params },
#?
default_csv => $opt->{default_csv},
params => { map { $_ => $param->{$_} } @pass_params },
#?
default_csv => $opt->{default_csv},
+ preinsert_callback => $opt->{preinsert_callback},
postinsert_callback => $opt->{postinsert_callback},
postinsert_callback => $opt->{postinsert_callback},
+ insert_args_callback => $opt->{insert_args_callback},
);
if ( $opt->{'batch_namecol'} ) {
);
if ( $opt->{'batch_namecol'} ) {
@@
-1731,6
+1740,8
@@
Class method for batch imports. Available params:
=item format_row_callbacks
=item format_row_callbacks
+=item format_hash_callbacks - After parsing, before object creation
+
=item fields - Alternate way to specify import, specifying import fields directly as a listref
=item preinsert_callback
=item fields - Alternate way to specify import, specifying import fields directly as a listref
=item preinsert_callback
@@
-1772,7
+1783,7
@@
sub batch_import {
my( $type, $header, $sep_char,
$fixedlength_format, $xml_format, $asn_format,
my( $type, $header, $sep_char,
$fixedlength_format, $xml_format, $asn_format,
- $parser_opt, $row_callback, @fields );
+ $parser_opt, $row_callback,
$hash_callback,
@fields );
my $postinsert_callback = '';
$postinsert_callback = $param->{'postinsert_callback'}
my $postinsert_callback = '';
$postinsert_callback = $param->{'postinsert_callback'}
@@
-1780,6
+1791,9
@@
sub batch_import {
my $preinsert_callback = '';
$preinsert_callback = $param->{'preinsert_callback'}
if $param->{'preinsert_callback'};
my $preinsert_callback = '';
$preinsert_callback = $param->{'preinsert_callback'}
if $param->{'preinsert_callback'};
+ my $insert_args_callback = '';
+ $insert_args_callback = $param->{'insert_args_callback'}
+ if $param->{'insert_args_callback'};
if ( $param->{'format'} ) {
if ( $param->{'format'} ) {
@@
-1825,6
+1839,11
@@
sub batch_import {
? $param->{'format_row_callbacks'}{ $param->{'format'} }
: '';
? $param->{'format_row_callbacks'}{ $param->{'format'} }
: '';
+ $hash_callback =
+ $param->{'format_hash_callbacks'}
+ ? $param->{'format_hash_callbacks'}{ $param->{'format'} }
+ : '';
+
@fields = @{ $formats->{ $format } };
} elsif ( $param->{'fields'} ) {
@fields = @{ $formats->{ $format } };
} elsif ( $param->{'fields'} ) {
@@
-1834,6
+1853,7
@@
sub batch_import {
$sep_char = ',';
$fixedlength_format = '';
$row_callback = '';
$sep_char = ',';
$fixedlength_format = '';
$row_callback = '';
+ $hash_callback = '';
@fields = @{ $param->{'fields'} };
} else {
@fields = @{ $param->{'fields'} };
} else {
@@
-2059,6
+2079,8
@@
sub batch_import {
$hash{custnum} = $2;
}
$hash{custnum} = $2;
}
+ %hash = &{$hash_callback}(%hash) if $hash_callback;
+
#my $table = $param->{table};
my $class = "FS::$table";
#my $table = $param->{table};
my $class = "FS::$table";
@@
-2089,7
+2111,12
@@
sub batch_import {
next if exists $param->{skiprow} && $param->{skiprow};
}
next if exists $param->{skiprow} && $param->{skiprow};
}
- my $error = $record->insert;
+ my @insert_args = ();
+ if ( $insert_args_callback ) {
+ @insert_args = &{$insert_args_callback}($record, $param);
+ }
+
+ my $error = $record->insert(@insert_args);
if ( $error ) {
$dbh->rollback if $oldAutoCommit;
if ( $error ) {
$dbh->rollback if $oldAutoCommit;
@@
-2139,7
+2166,7
@@
sub _h_statement {
;
# If we're encrypting then don't store the payinfo in the history
;
# If we're encrypting then don't store the payinfo in the history
- if ( $conf
&& $conf->exists('encryption')
&& $self->table ne 'banned_pay' ) {
+ if ( $conf
_encryption
&& $self->table ne 'banned_pay' ) {
@fields = grep { $_ ne 'payinfo' } @fields;
}
@fields = grep { $_ ne 'payinfo' } @fields;
}
@@
-3036,7
+3063,7
@@
sub encrypt {
my ($self, $value) = @_;
my $encrypted = $value;
my ($self, $value) = @_;
my $encrypted = $value;
- if ($conf
->exists('encryption')
) {
+ if ($conf
_encryption
) {
if ($self->is_encrypted($value)) {
# Return the original value if it isn't plaintext.
$encrypted = $value;
if ($self->is_encrypted($value)) {
# Return the original value if it isn't plaintext.
$encrypted = $value;
@@
-3084,7
+3111,7
@@
You should generally not have to worry about calling this, as the system handles
sub decrypt {
my ($self,$value) = @_;
my $decrypted = $value; # Will return the original value if it isn't encrypted or can't be decrypted.
sub decrypt {
my ($self,$value) = @_;
my $decrypted = $value; # Will return the original value if it isn't encrypted or can't be decrypted.
- if ($conf
->exists('encryption')
&& $self->is_encrypted($value)) {
+ if ($conf
_encryption
&& $self->is_encrypted($value)) {
$self->loadRSA;
if (ref($rsa_decrypt) =~ /::RSA/) {
my $encrypted = unpack ("u*", $value);
$self->loadRSA;
if (ref($rsa_decrypt) =~ /::RSA/) {
my $encrypted = unpack ("u*", $value);
@@
-3100,8
+3127,8
@@
sub loadRSA {
#Initialize the Module
$rsa_module = 'Crypt::OpenSSL::RSA'; # The Default
#Initialize the Module
$rsa_module = 'Crypt::OpenSSL::RSA'; # The Default
- if ($conf
->exists('encryptionmodule') && $conf->config('encryptionmodule')
ne '') {
- $rsa_module = $conf
->config('encryptionmodule')
;
+ if ($conf
_encryptionmodule && $conf_encryptionmodule
ne '') {
+ $rsa_module = $conf
_encryptionmodule
;
}
if (!$rsa_loaded) {
}
if (!$rsa_loaded) {
@@
-3109,14
+3136,14
@@
sub loadRSA {
$rsa_loaded++;
}
# Initialize Encryption
$rsa_loaded++;
}
# Initialize Encryption
- if ($conf
->exists('encryptionpublickey') && $conf->config('encryptionpublickey')
ne '') {
- my $public_key = join("\n",$conf
->config('encryptionpublickey')
);
+ if ($conf
_encryptionpublickey && $conf_encryptionpublickey
ne '') {
+ my $public_key = join("\n",$conf
_encryptionpublickey
);
$rsa_encrypt = $rsa_module->new_public_key($public_key);
}
# Intitalize Decryption
$rsa_encrypt = $rsa_module->new_public_key($public_key);
}
# Intitalize Decryption
- if ($conf
->exists('encryptionprivatekey') && $conf->config('encryptionprivatekey')
ne '') {
- my $private_key = join("\n",$conf
->config('encryptionprivatekey')
);
+ if ($conf
_encryptionprivatekey && $conf_encryptionprivatekey
ne '') {
+ my $private_key = join("\n",$conf
_encryptionprivatekey
);
$rsa_decrypt = $rsa_module->new_private_key($private_key);
}
}
$rsa_decrypt = $rsa_module->new_private_key($private_key);
}
}