equal
deleted
inserted
replaced
42 self.trusted_users = {} |
42 self.trusted_users = {} |
43 self.trusted_groups = {} |
43 self.trusted_groups = {} |
44 # if ucdata is not None, its keys must be a superset of cdata's |
44 # if ucdata is not None, its keys must be a superset of cdata's |
45 self.cdata = util.configparser() |
45 self.cdata = util.configparser() |
46 self.ucdata = None |
46 self.ucdata = None |
|
47 # we always trust global config files |
|
48 self.check_trusted = False |
47 self.readconfig(util.rcpath()) |
49 self.readconfig(util.rcpath()) |
|
50 self.check_trusted = True |
48 self.updateopts(verbose, debug, quiet, interactive) |
51 self.updateopts(verbose, debug, quiet, interactive) |
49 else: |
52 else: |
50 # parentui may point to an ui object which is already a child |
53 # parentui may point to an ui object which is already a child |
51 self.parentui = parentui.parentui or parentui |
54 self.parentui = parentui.parentui or parentui |
52 self.readhooks = self.parentui.readhooks[:] |
55 self.readhooks = self.parentui.readhooks[:] |
89 self.quiet = False |
92 self.quiet = False |
90 elif self.verbose and self.quiet: |
93 elif self.verbose and self.quiet: |
91 self.quiet = self.verbose = False |
94 self.quiet = self.verbose = False |
92 |
95 |
93 def _is_trusted(self, fp, f, warn=True): |
96 def _is_trusted(self, fp, f, warn=True): |
|
97 if not self.check_trusted: |
|
98 return True |
94 tusers = self.trusted_users |
99 tusers = self.trusted_users |
95 tgroups = self.trusted_groups |
100 tgroups = self.trusted_groups |
96 if (tusers or tgroups) and '*' not in tusers and '*' not in tgroups: |
101 if (tusers or tgroups) and '*' not in tusers and '*' not in tgroups: |
97 st = util.fstat(fp) |
102 st = util.fstat(fp) |
98 user = util.username(st.st_uid) |
103 user = util.username(st.st_uid) |