Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
apk-tools
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Hassan Albahri
apk-tools
Commits
1339b143
Commit
1339b143
authored
15 years ago
by
Timo Teräs
Browse files
Options
Downloads
Patches
Plain Diff
db: don't run pre-install until control data is verified
to make sure the scripts have not been altered.
parent
84e3786e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/database.c
+29
-8
29 additions, 8 deletions
src/database.c
with
29 additions
and
8 deletions
src/database.c
+
29
−
8
View file @
1339b143
...
...
@@ -37,6 +37,7 @@ struct install_ctx {
struct
apk_package
*
pkg
;
int
script
;
int
script_pending
:
1
;
struct
apk_db_dir_instance
*
diri
;
struct
apk_checksum
data_csum
;
struct
apk_sign_ctx
sctx
;
...
...
@@ -1233,6 +1234,24 @@ static void extract_cb(void *_ctx, size_t progress)
}
}
static
int
apk_db_run_pending_script
(
struct
install_ctx
*
ctx
)
{
int
r
;
if
(
!
ctx
->
script_pending
)
return
0
;
if
(
!
ctx
->
sctx
.
control_verified
)
return
0
;
ctx
->
script_pending
=
FALSE
;
r
=
apk_pkg_run_script
(
ctx
->
pkg
,
ctx
->
db
->
root_fd
,
ctx
->
script
);
if
(
r
!=
0
)
apk_error
(
"%s-%s: Failed to execute "
"pre-install/upgrade script"
,
ctx
->
pkg
->
name
->
name
,
ctx
->
pkg
->
version
);
return
r
;
}
static
int
apk_db_install_archive_entry
(
void
*
_ctx
,
const
struct
apk_file_info
*
ae
,
struct
apk_istream
*
is
)
...
...
@@ -1275,16 +1294,15 @@ static int apk_db_install_archive_entry(void *_ctx,
/* Handle script */
if
(
type
!=
APK_SCRIPT_INVALID
)
{
apk_pkg_add_script
(
pkg
,
is
,
type
,
ae
->
size
);
if
(
type
==
ctx
->
script
)
ctx
->
script_pending
=
TRUE
;
return
apk_db_run_pending_script
(
ctx
);
}
if
(
type
==
ctx
->
script
)
{
r
=
apk_pkg_run_script
(
pkg
,
db
->
root_fd
,
ctx
->
script
);
if
(
r
!=
0
)
apk_error
(
"%s-%s: Failed to execute pre-install/upgrade script"
,
pkg
->
name
->
name
,
pkg
->
version
);
}
r
=
apk_db_run_pending_script
(
ctx
);
if
(
r
!=
0
)
return
r
;
}
/* Show progress */
if
(
ctx
->
cb
)
{
...
...
@@ -1501,6 +1519,9 @@ static int apk_db_unpack_pkg(struct apk_database *db,
newpkg
->
name
->
name
,
newpkg
->
version
);
return
-
1
;
}
r
=
apk_db_run_pending_script
(
&
ctx
);
if
(
r
!=
0
)
return
r
;
if
(
need_copy
)
{
char
file2
[
256
];
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment