Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ jobs:
- name: Build V
shell: cmd
run: |
make.bat -gcc
makev.bat -gcc
# Must run after "Build V": the script shells out to `v.exe`, which
# does not exist until V is built.
- name: Install SQLite
Expand Down
7 changes: 4 additions & 3 deletions gitly.v
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ fn new_app() !&App {

mut app := &App{
// db: sqlite.connect('gitly.sqlite') or { panic(err) }
db: connect_db(conf)!
config: conf
db: connect_db(conf)!
config: conf
started_at: time.now().unix()
}

Expand Down Expand Up @@ -747,6 +747,7 @@ fn (mut app App) migrate_tables() ! {
app.add_missing_column('Issue', 'milestone_id', 'INTEGER NOT NULL DEFAULT 0')!
app.add_missing_column('Issue', 'iteration_id', 'INTEGER NOT NULL DEFAULT 0')!
app.add_missing_column('Issue', 'time_estimate_minutes', 'INTEGER NOT NULL DEFAULT 0')!
app.add_missing_column('Issue', 'is_confidential', db_bool_column_type())!
app.add_missing_column('Label', 'scope', "TEXT NOT NULL DEFAULT ''")!
app.add_missing_column('Project', 'label_id', 'INTEGER NOT NULL DEFAULT 0')!
app.add_missing_column('Project', 'milestone_id', 'INTEGER NOT NULL DEFAULT 0')!
Expand Down Expand Up @@ -914,7 +915,7 @@ fn (mut app App) add_missing_column(table_name string, column_name string, colum
fn (mut ctx Context) json_success[T](result T) veb.Result {
response := api.ApiSuccessResponse[T]{
success: true
result: result
result: result
}

return ctx.json(response)
Expand Down
4 changes: 2 additions & 2 deletions highlight/markdown_test.v
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
module highlight

const markdown = '<script> alert(true) </script> <!-- comment -->test'
const xss_markdown_sample = '<script> alert(true) </script> <!-- comment -->test'

fn test_convert_markdown_to_html() {
rendered := convert_markdown_to_html(markdown)
rendered := convert_markdown_to_html(xss_markdown_sample)
assert !rendered.contains('<script>')
assert rendered.contains('&lt;script&gt;')
assert rendered.contains('test</p>')
Expand Down
11 changes: 6 additions & 5 deletions issue.v
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@ mut:
author_id int
repo_id int
is_pr bool
assigned []int @[skip]
assigned []int @[skip]
labels []Label @[skip]
comments_count int
title string
text string
is_confidential bool
created_at int
status IssueStatus
linked_issues []int @[skip]
Expand Down Expand Up @@ -394,9 +395,9 @@ fn (mut app App) sync_repo_open_issue_count(repo_id int) ! {
fn placeholder_user(user_id int) User {
username := if user_id > 0 { 'user-${user_id}' } else { 'unknown-user' }
return User{
id: user_id
id: user_id
username: username
avatar: default_avatar_name
avatar: default_avatar_name
}
}

Expand Down Expand Up @@ -513,8 +514,8 @@ fn (mut app App) assign_issue(issue_id int, user_id int) ! {
return
}
assignment := IssueAssignee{
issue_id: issue_id
user_id: user_id
issue_id: issue_id
user_id: user_id
created_at: int(time.now().unix())
}
sql app.db {
Expand Down
29 changes: 21 additions & 8 deletions issue_routes.v
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ fn (mut app App) handle_issues_count(username string, repo_name string) veb.Resu
count := app.get_repo_issue_count(repo.id)
return ctx.json(api.ApiIssueCount{
success: true
result: count
result: count
})
}

Expand Down Expand Up @@ -74,20 +74,27 @@ pub fn (mut app App) handle_add_repo_issue(mut ctx Context, username string, rep
}
title := ctx.form['title']
text := ctx.form['text']
is_confidential := 'confidential' in ctx.form
if !valid_title(title) || !valid_body(text) {
ctx.error('Issue title is missing or the description is too long')
return ctx.redirect('/${username}/${repo_name}/issues/new')
}
app.add_issue(repo.id, ctx.user.id, title, text) or {
issue_id := app.add_issue_returning_id(repo.id, ctx.user.id, title, text) or {
app.info(err.str())
return ctx.redirect('/${username}/${repo_name}/issues/new')
}
if is_confidential {
sql app.db {
update Issue set is_confidential = true where id == issue_id
} or { app.info(err.str()) }
}

app.increment_user_post(mut ctx.user) or { app.info(err.str()) }
app.sync_repo_open_issue_count(repo.id) or { app.info(err.str()) }
app.dispatch_webhook(repo.id, 'issue', WebhookIssuePayload{
action: 'opened'
repo: '${username}/${repo_name}'
title: title
repo: '${username}/${repo_name}'
title: title
author: ctx.user.username
})
has_first_issue_activity := app.has_activity(ctx.user.id, 'first_issue')
Expand Down Expand Up @@ -156,6 +163,12 @@ pub fn (mut app App) issues(mut ctx Context, username string, repo_name string,
mut i := 0
for i = 0; i < repo_issues.len; i++ {
issue = repo_issues[i]
if issue.is_confidential && ctx.logged_in && issue.author_id != ctx.user.id && !app.can_admin_repo(ctx, repo) {
continue
}
if issue.is_confidential && !ctx.logged_in {
continue
}
user = app.get_user_by_id(issue.author_id) or { placeholder_user(issue.author_id) }
issue.labels = app.get_issue_labels(issue.id)
issue.repo_author = repo.user_name
Expand Down Expand Up @@ -261,8 +274,8 @@ pub fn (mut app App) handle_edit_issue(mut ctx Context, username string, repo_na
}
app.dispatch_webhook(repo.id, 'issue', WebhookIssuePayload{
action: 'updated'
repo: '${username}/${repo_name}'
title: title.trim_space()
repo: '${username}/${repo_name}'
title: title.trim_space()
author: ctx.user.username
})
return ctx.redirect('/${username}/${repo_name}/issue/${issue.id}')
Expand Down Expand Up @@ -376,8 +389,8 @@ fn change_issue_status(mut app App, mut ctx Context, username string, repo_name
action := if status == .closed { 'closed' } else { 'reopened' }
app.dispatch_webhook(repo.id, 'issue', WebhookIssuePayload{
action: action
repo: '${username}/${repo_name}'
title: issue.title
repo: '${username}/${repo_name}'
title: issue.title
author: ctx.user.username
})
return ctx.redirect('/${username}/${repo_name}/issue/${issue.id}')
Expand Down
2 changes: 1 addition & 1 deletion repo/repo.v
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ fn (mut app App) search_public_repos(query string) []Repo {
// unrelated users.
fn (mut app App) search_repos(query string, user_id int) []Repo {
pattern := sql_like_pattern(query)
repo_rows := db_exec_values(mut app.db, 'select id from ${sql_table('Repo')} where is_deleted is false and (\n\t\t\tlower(name) like lower(${pattern}) or lower(user_name) like lower(${pattern}) or lower(description) like lower(${pattern})\n\t\t) order by nr_stars desc, name asc limit ${search_candidate_limit}') or {
repo_rows := db_exec_values(mut app.db, 'select id from ${sql_table('Repo')} where is_deleted is false and (\n\t\t\tlower(name) like lower(${pattern}) or lower(user_name) like lower(${pattern}) or lower(description) like lower(${pattern})\n\t\t) order by stars_count desc, name asc limit ${search_candidate_limit}') or {
app.warn('Repository search failed: ${err}')
return []
}
Expand Down
3 changes: 3 additions & 0 deletions templates/new/issue.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ <h1>New issue</h1>
</div>
<div class="field">
<textarea name='text' placeholder='Description (optional)'></textarea>
<div class="field">
<label><input type='checkbox' name='confidential'> Confidential issue</label>
</div>
</div>
<div class="field">
<input type='submit' value='Submit new issue'>
Expand Down
Loading