Skip to content

feat: support multiline patterns in switch rule conditions #288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rz467fzs7d wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: support multiline patterns in switch rule conditions #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 17 additions & 5 deletions omega-pac/src/conditions.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,11 @@ module.exports = exports =

'UrlRegexCondition':
abbrs: ['UR', 'URegex', 'UrlR', 'UrlRegex']
analyze: (condition) -> @safeRegex escapeSlash condition.pattern
analyze: (condition) ->
raw = condition.pattern.split(/[|\n]/)
parts = for p in raw when p.trim()
escapeSlash p.trim()
@safeRegex parts.join('|')
match: (condition, request, cache) ->
return cache.analyzed.test(request.url)
compile: (condition, cache) ->
Expand All @@ -257,8 +261,9 @@ module.exports = exports =
abbrs: ['U', 'UW', 'Url', 'UrlW', 'UWild', 'UWildcard', 'UrlWild',
'UrlWildcard']
analyze: (condition) ->
parts = for pattern in condition.pattern.split('|') when pattern
shExp2RegExp pattern, trimAsterisk: true
raw = condition.pattern.split(/[|\n]/)
parts = for pattern in raw when pattern.trim()
shExp2RegExp pattern.trim(), trimAsterisk: true
@safeRegex parts.join('|')
match: (condition, request, cache) ->
return cache.analyzed.test(request.url)
Expand All @@ -267,7 +272,11 @@ module.exports = exports =

'HostRegexCondition':
abbrs: ['R', 'HR', 'Regex', 'HostR', 'HRegex', 'HostRegex']
analyze: (condition) -> @safeRegex escapeSlash condition.pattern
analyze: (condition) ->
raw = condition.pattern.split(/[|\n]/)
parts = for p in raw when p.trim()
escapeSlash p.trim()
@safeRegex parts.join('|')
match: (condition, request, cache) ->
return cache.analyzed.test(request.host)
compile: (condition, cache) ->
Expand All @@ -277,7 +286,9 @@ module.exports = exports =
abbrs: ['', 'H', 'W', 'HW', 'Wild', 'Wildcard', 'Host', 'HostW', 'HWild',
'HWildcard', 'HostWild', 'HostWildcard']
analyze: (condition) ->
parts = for pattern in condition.pattern.split('|') when pattern
raw = condition.pattern.split(/[|\n]/)
parts = for pattern in raw when pattern.trim()
pattern = pattern.trim()
# Get the magical regex of this pattern. See
# https://github.com/FelisCatus/SwitchyOmega/wiki/Host-wildcard-condition
# for the magic.
Expand Down Expand Up @@ -684,4 +695,5 @@ module.exports = exports =
condition.startHour = 0 unless 0 <= condition.startHour < 24
condition.endHour = 0 unless 0 <= condition.endHour < 24
condition

# coffeelint: enable=missing_fat_arrows
12 changes: 8 additions & 4 deletions omega-web/src/omega/controllers/switch_profile.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,12 +192,16 @@ angular.module('omega').controller 'SwitchProfileCtrl', ($scope, $rootScope,
rule.condition.pattern = ''
$scope.profile.rules.push rule

$scope.isMultiline = (pattern) ->
pattern and pattern.indexOf('\n') >= 0

$scope.validateCondition = (condition, pattern) ->
if condition.conditionType.indexOf('Regex') >= 0
try
new RegExp(pattern)
catch _
return false
for line in pattern.split(/[|\n]/) when line.trim()
try
new RegExp(line.trim())
catch _
return false
return true

$scope.conditionHasWarning = (condition) ->
Expand Down
12 changes: 10 additions & 2 deletions omega-web/src/partials/profile_switch.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,16 @@ div(ng-controller='SwitchProfileCtrl')
label.checkbox-inline(ng-repeat='selected in getWeekdayList(rule.condition) track by $index')
input(type='checkbox' ng-model='selected' ng-change='updateDay(rule.condition, $index, selected)')
= '{{"options_weekDayShort_" + $index | tr}} '
input.form-control(ng-model='rule.condition.pattern' ng-switch-default required
ui-validate='{pattern: "validateCondition(rule.condition, $value)"}')
span.input-group(ng-switch-default)
textarea.form-control.monospace(ng-model='rule.condition.pattern' required
rows='{{rule._expanded ? 10 : 1}}'
ng-click='!rule._expanded && isMultiline(rule.condition.pattern) && (rule._expanded = true)'
ng-keydown='!rule._expanded && $event.keyCode === 13 && $event.preventDefault()'
ng-style='{cursor: !rule._expanded && isMultiline(rule.condition.pattern) ? "pointer" : "auto", resize: "none", overflow: rule._expanded ? "auto" : "hidden", height: rule._expanded ? "auto" : "34px"}'
ui-validate='{pattern: "validateCondition(rule.condition, $value)"}')
span.input-group-btn
button.btn.btn-default(type='button' ng-click='rule._expanded = !rule._expanded')
span.glyphicon(ng-class='rule._expanded ? "glyphicon-chevron-up" : "glyphicon-chevron-down"')
td.switch-rule-row-target
div(omega-profile-select='options | profiles:profile' ng-model='rule.profileName'
disp-name='dispNameFilter' options='options'
Expand Down