diff options
author | Andreas Brandl <abrandl@gitlab.com> | 2019-04-05 13:02:56 +0000 |
---|---|---|
committer | Andreas Brandl <abrandl@gitlab.com> | 2019-04-05 13:02:56 +0000 |
commit | 46b1b9c1d61c269588bd3cd4203420608ddd7f0b (patch) | |
tree | a877f5366d3367e1264e96f3f5e8a4b23bdbd62a /app/services/concerns | |
parent | 7a48a06cf3b454021aa466464686fee8c82d6862 (diff) | |
download | gitlab-ce-46b1b9c1d61c269588bd3cd4203420608ddd7f0b.tar.gz |
Revert "Merge branch 'if-57131-external_auth_to_ce' into 'master'"
This reverts merge request !26823
Diffstat (limited to 'app/services/concerns')
-rw-r--r-- | app/services/concerns/validates_classification_label.rb | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/app/services/concerns/validates_classification_label.rb b/app/services/concerns/validates_classification_label.rb deleted file mode 100644 index ebcf5c24ff8..00000000000 --- a/app/services/concerns/validates_classification_label.rb +++ /dev/null @@ -1,27 +0,0 @@ -# frozen_string_literal: true - -module ValidatesClassificationLabel - def validate_classification_label(record, attribute_name) - return unless ::Gitlab::ExternalAuthorization.enabled? - return unless classification_label_change?(record, attribute_name) - - new_label = params[attribute_name].presence - new_label ||= ::Gitlab::CurrentSettings.current_application_settings - .external_authorization_service_default_label - - unless ::Gitlab::ExternalAuthorization.access_allowed?(current_user, new_label) - reason = rejection_reason_for_label(new_label) - message = s_('ClassificationLabelUnavailable|is unavailable: %{reason}') % { reason: reason } - record.errors.add(attribute_name, message) - end - end - - def rejection_reason_for_label(label) - reason_from_service = ::Gitlab::ExternalAuthorization.rejection_reason(current_user, label).presence - reason_from_service || _("Access to '%{classification_label}' not allowed") % { classification_label: label } - end - - def classification_label_change?(record, attribute_name) - params.key?(attribute_name) || record.new_record? - end -end |