Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
20d94312
J
jenkins
项目概览
xxadev
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jenkins
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
20d94312
编写于
6月 29, 2018
作者:
D
Daniel Beck
提交者:
GitHub
6月 29, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #3519 from jsoref/legacy-api-token-ux
Legacy api token ux
上级
ffb18ffe
ad4c1250
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
14 addition
and
14 deletion
+14
-14
core/src/main/java/jenkins/security/apitoken/ApiTokenPropertyConfiguration.java
...kins/security/apitoken/ApiTokenPropertyConfiguration.java
+5
-5
core/src/main/resources/hudson/model/User/index.jelly
core/src/main/resources/hudson/model/User/index.jelly
+1
-1
core/src/main/resources/hudson/model/View/AsynchPeople/index.jelly
...main/resources/hudson/model/View/AsynchPeople/index.jelly
+1
-1
core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly
...es/hudson/security/HudsonPrivateSecurityRealm/index.jelly
+1
-1
core/src/main/resources/jenkins/security/apitoken/LegacyApiTokenAdministrativeMonitor/manage.properties
...ken/LegacyApiTokenAdministrativeMonitor/manage.properties
+6
-6
未找到文件。
core/src/main/java/jenkins/security/apitoken/ApiTokenPropertyConfiguration.java
浏览文件 @
20d94312
...
...
@@ -37,19 +37,19 @@ import org.jenkinsci.Symbol;
@Symbol
(
"apiToken"
)
public
class
ApiTokenPropertyConfiguration
extends
GlobalConfiguration
{
/**
* When a user is created, this property determine
if we create a legacy token for the user or not
* For security reason
, we do not recommend to enable this but we let that open to ease upgrade
.
* When a user is created, this property determine
s whether or not we create a legacy token for the user.
* For security reason
s, we do not recommend you enable this but we left that open to ease upgrades
.
*/
private
boolean
tokenGenerationOnCreationEnabled
=
false
;
/**
* When a user has a legacy token, this property determine
if the user can request a new legacy token or not
* For security reason
, we do not recommend to enable this but we let that open to ease upgrade
.
* When a user has a legacy token, this property determine
s whether or not the user can request a new legacy token.
* For security reason
s, we do not recommend you enable this but we left that open to ease upgrades
.
*/
private
boolean
creationOfLegacyTokenEnabled
=
false
;
/**
* Each time an API Token is used, its usage counter is incremented and the last us
age date is updated.
* Each time an API Token is used, its usage counter is incremented and the last us
ed date is updated.
* You can disable this feature using this property.
*/
private
boolean
usageStatisticsEnabled
=
true
;
...
...
core/src/main/resources/hudson/model/User/index.jelly
浏览文件 @
20d94312
...
...
@@ -32,7 +32,7 @@ THE SOFTWARE.
</h1>
<t:editableDescription permission="${app.ADMINISTER}" />
<div>
${%Jenkins User I
d
}: ${it.id}
${%Jenkins User I
D
}: ${it.id}
</div>
<!-- give properties a chance to contribute summary item -->
<j:forEach var="p" items="${it.allProperties}">
...
...
core/src/main/resources/hudson/model/View/AsynchPeople/index.jelly
浏览文件 @
20d94312
...
...
@@ -101,7 +101,7 @@ THE SOFTWARE.
<table class="sortable pane bigtable" id="people">
<tr>
<th />
<th>${%User I
d
}</th>
<th>${%User I
D
}</th>
<th>${%Name}</th>
<th initialSortDir="up">${%Last Commit Activity}</th>
<th>${%On}</th>
...
...
core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly
浏览文件 @
20d94312
...
...
@@ -33,7 +33,7 @@ THE SOFTWARE.
<table class="sortable pane bigtable" id="people">
<tr>
<th style="width:32px"/>
<th>${%User I
d
}</th>
<th>${%User I
D
}</th>
<th>${%Name}</th>
<th style="width:32px"/>
</tr>
...
...
core/src/main/resources/jenkins/security/apitoken/LegacyApiTokenAdministrativeMonitor/manage.properties
浏览文件 @
20d94312
...
...
@@ -4,24 +4,24 @@ contextMessage=The following users have a legacy API token. \
Additionally, in previous versions of Jenkins, API tokens were automatically created for every new user.
\
Often, users did not use the token, resulting in a larger attack surface than necessary.
\
Automatic token generation must now be enabled explicitly.
recommendationMessage
=
For such reasons, we recommend
to
:
\
recommendationMessage
=
For such reasons, we recommend
you
:
\
<ul>
\
<li>revoke the tokens that were never used and</li>
\
<li>ask users that are currently using their legacy token to generate a token using the new system and revoke their legacy token</li>
\
</ul>
UserId
=
User I
d
UserId
=
User I
D
UserFullName
=
User full name
TokenName
=
Token name
NumDaysSinceCreation
=
Days since creation
NumOfUse
=
# of use
NumOfUse
=
# of use
s
NumDaysSinceLastUse=Days since last use
HasFreshToken
=
Fresh token?
HasFreshToken_tooltip
=
A fresh token is one that was created using the new system
\
after the most recent use of the user''s legacy token.
\n\
Note: the creation date of legacy tokens which have never been used are reset every time Jenkins is restarted,
\
which means that the date
may
be inaccurate.
HasFreshToken_ok_tooltip
=
A fresh token exist
for that
user
HasFreshToken_warning_tooltip
=
No fresh token exist
for that
user
which means that the date
for those tokens will
be inaccurate.
HasFreshToken_ok_tooltip
=
A fresh token exist
s for this
user
HasFreshToken_warning_tooltip
=
No fresh token exist
s for this
user
HasMoreRecentlyUsedToken
=
Recent token?
HasMoreRecentlyUsedToken_tooltip
=
A recently used token is one that was created using the new system
\
and used more recently than the user''s legacy token.
\n\
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录