Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
1eb571b7
Commit
1eb571b7
authored
Jun 20, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Proper handle policy changes
parent
dd3b716d
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
17 deletions
+30
-17
MagiskManager.java
app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
+1
-1
SuDatabaseHelper.java
.../java/com/topjohnwu/magisk/database/SuDatabaseHelper.java
+26
-12
PackageReceiver.java
.../java/com/topjohnwu/magisk/receivers/PackageReceiver.java
+2
-2
SuReceiver.java
.../main/java/com/topjohnwu/magisk/superuser/SuReceiver.java
+1
-2
No files found.
app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
View file @
1eb571b7
...
...
@@ -89,7 +89,6 @@ public class MagiskManager extends Application {
public
void
onCreate
()
{
super
.
onCreate
();
prefs
=
PreferenceManager
.
getDefaultSharedPreferences
(
this
);
suDB
=
new
SuDatabaseHelper
(
this
);
}
public
void
toast
(
String
msg
,
int
duration
)
{
...
...
@@ -146,6 +145,7 @@ public class MagiskManager extends Application {
}
public
void
initSUConfig
()
{
suDB
=
new
SuDatabaseHelper
(
this
);
suRequestTimeout
=
Utils
.
getPrefsInt
(
prefs
,
"su_request_timeout"
,
10
);
suResponseType
=
Utils
.
getPrefsInt
(
prefs
,
"su_auto_response"
,
0
);
suNotificationType
=
Utils
.
getPrefsInt
(
prefs
,
"su_notification"
,
1
);
...
...
app/src/main/java/com/topjohnwu/magisk/database/SuDatabaseHelper.java
View file @
1eb571b7
...
...
@@ -35,6 +35,7 @@ public class SuDatabaseHelper extends SQLiteOpenHelper {
super
(
context
,
"su.db"
,
null
,
DATABASE_VER
);
magiskManager
=
Utils
.
getMagiskManager
(
context
);
pm
=
context
.
getPackageManager
();
cleanup
();
}
@Override
...
...
@@ -91,6 +92,16 @@ public class SuDatabaseHelper extends SQLiteOpenHelper {
"(key TEXT, value INT, PRIMARY KEY(key))"
);
}
private
void
cleanup
()
{
SQLiteDatabase
db
=
getWritableDatabase
();
// Clear outdated policies
db
.
delete
(
POLICY_TABLE
,
"until > 0 AND until < ?"
,
new
String
[]
{
String
.
valueOf
(
System
.
currentTimeMillis
())
});
// Clear outdated logs
db
.
delete
(
LOG_TABLE
,
"time < ?"
,
new
String
[]
{
String
.
valueOf
(
System
.
currentTimeMillis
()
/
1000
-
magiskManager
.
suLogTimeout
*
86400
)
});
}
public
void
deletePolicy
(
Policy
policy
)
{
deletePolicy
(
policy
.
packageName
);
}
...
...
@@ -103,10 +114,14 @@ public class SuDatabaseHelper extends SQLiteOpenHelper {
public
void
deletePolicy
(
int
uid
)
{
SQLiteDatabase
db
=
getWritableDatabase
();
d
b
.
delete
(
POLICY_TABLE
,
"uid=?"
,
new
String
[]{
String
.
valueOf
(
uid
)}
);
d
eletePolicy
(
db
,
uid
);
db
.
close
();
}
private
void
deletePolicy
(
SQLiteDatabase
db
,
int
uid
)
{
db
.
delete
(
POLICY_TABLE
,
"uid=?"
,
new
String
[]{
String
.
valueOf
(
uid
)});
}
public
Policy
getPolicy
(
int
uid
)
{
Policy
policy
=
null
;
SQLiteDatabase
db
=
getReadableDatabase
();
...
...
@@ -145,18 +160,19 @@ public class SuDatabaseHelper extends SQLiteOpenHelper {
public
void
updatePolicy
(
Policy
policy
)
{
SQLiteDatabase
db
=
getWritableDatabase
();
updatePolicy
(
db
,
policy
);
db
.
close
();
}
private
void
updatePolicy
(
SQLiteDatabase
db
,
Policy
policy
)
{
db
.
update
(
POLICY_TABLE
,
policy
.
getContentValues
(),
"package_name=?"
,
new
String
[]
{
policy
.
packageName
});
db
.
close
();
}
public
List
<
Policy
>
getPolicyList
(
PackageManager
pm
)
{
List
<
Policy
>
ret
=
new
ArrayList
<>();
SQLiteDatabase
db
=
getWritableDatabase
();
Policy
policy
;
// Clear outdated policies
db
.
delete
(
POLICY_TABLE
,
"until > 0 AND until < ?"
,
new
String
[]
{
String
.
valueOf
(
System
.
currentTimeMillis
())
});
try
(
Cursor
c
=
db
.
query
(
POLICY_TABLE
,
null
,
null
,
null
,
null
,
null
,
null
))
{
while
(
c
.
moveToNext
())
{
try
{
...
...
@@ -165,17 +181,18 @@ public class SuDatabaseHelper extends SQLiteOpenHelper {
if
(
policy
.
info
.
uid
!=
policy
.
uid
)
{
if
(
magiskManager
.
suReauth
)
{
// Reauth required, remove from DB
deletePolicy
(
policy
.
uid
);
deletePolicy
(
db
,
policy
.
uid
);
continue
;
}
else
{
// No reauth,
we
use the new UID
// No reauth,
update to
use the new UID
policy
.
uid
=
policy
.
info
.
uid
;
updatePolicy
(
db
,
policy
);
}
}
ret
.
add
(
policy
);
}
catch
(
PackageManager
.
NameNotFoundException
e
)
{
// The app no longer exist, remove from DB
deletePolicy
(
c
.
getString
(
c
.
getColumnIndex
(
"package_name
"
)));
deletePolicy
(
db
,
c
.
getInt
(
c
.
getColumnIndex
(
"uid
"
)));
}
}
}
...
...
@@ -186,9 +203,6 @@ public class SuDatabaseHelper extends SQLiteOpenHelper {
private
List
<
SuLogEntry
>
getLogList
(
SQLiteDatabase
db
,
String
selection
)
{
List
<
SuLogEntry
>
ret
=
new
ArrayList
<>();
// Clear outdated logs
db
.
delete
(
LOG_TABLE
,
"time < ?"
,
new
String
[]
{
String
.
valueOf
(
System
.
currentTimeMillis
()
/
1000
-
magiskManager
.
suLogTimeout
*
86400
)
});
try
(
Cursor
c
=
db
.
query
(
LOG_TABLE
,
null
,
selection
,
null
,
null
,
null
,
"time DESC"
))
{
while
(
c
.
moveToNext
())
{
ret
.
add
(
new
SuLogEntry
(
c
));
...
...
@@ -211,7 +225,7 @@ public class SuDatabaseHelper extends SQLiteOpenHelper {
}
public
List
<
SuLogEntry
>
getLogList
(
String
selection
)
{
return
getLogList
(
get
Writ
ableDatabase
(),
selection
);
return
getLogList
(
get
Read
ableDatabase
(),
selection
);
}
public
void
addLog
(
SuLogEntry
log
)
{
...
...
app/src/main/java/com/topjohnwu/magisk/receivers/PackageReceiver.java
View file @
1eb571b7
...
...
@@ -12,13 +12,13 @@ public class PackageReceiver extends BroadcastReceiver {
@Override
public
void
onReceive
(
Context
context
,
Intent
intent
)
{
MagiskManager
magiskManager
=
Utils
.
getMagiskManager
(
context
);
magiskManager
.
initSUConfig
();
String
pkg
=
intent
.
getData
().
getEncodedSchemeSpecificPart
();
Policy
policy
=
magiskManager
.
suDB
.
getPolicy
(
pkg
);
if
(
policy
==
null
)
return
;
magiskManager
.
initSUConfig
();
switch
(
intent
.
getAction
())
{
case
Intent
.
ACTION_PACKAGE_ADDED
:
int
uid
=
intent
.
getIntExtra
(
Intent
.
EXTRA_UID
,
-
1
);
...
...
app/src/main/java/com/topjohnwu/magisk/superuser/SuReceiver.java
View file @
1eb571b7
...
...
@@ -27,6 +27,7 @@ public class SuReceiver extends BroadcastReceiver {
Policy
policy
;
MagiskManager
magiskManager
=
(
MagiskManager
)
context
.
getApplicationContext
();
magiskManager
.
initSUConfig
();
if
(
intent
==
null
)
return
;
...
...
@@ -55,8 +56,6 @@ public class SuReceiver extends BroadcastReceiver {
}
}
magiskManager
.
initSUConfig
();
SuLogEntry
log
=
new
SuLogEntry
(
policy
);
String
message
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment