From ff9be2cf8eb62ca3a8a6ebd988ad441136f9ccc5 Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Thu, 28 Feb 2013 14:13:04 +0100 Subject: [PATCH] Made it also compilable with compiler < 7.2 --- .../security/openid/consumer/README.md | 2 -- .../openid/consumer/demo/application.e | 2 +- .../security/openid/consumer/openid-safe.ecf | 2 +- .../security/openid/consumer/openid.ecf | 2 +- .../openid/consumer/src/openid_consumer.e | 8 ++++---- .../consumer/src/openid_consumer_validation.e | 20 +++++++++---------- 6 files changed, 16 insertions(+), 20 deletions(-) diff --git a/draft/library/security/openid/consumer/README.md b/draft/library/security/openid/consumer/README.md index 3c37bf28..1a36443a 100644 --- a/draft/library/security/openid/consumer/README.md +++ b/draft/library/security/openid/consumer/README.md @@ -1,7 +1,5 @@ OpenID consumer -Requirement: EiffelStudio 7.2 - http://en.wikipedia.org/wiki/Openid Anyone wanting to contribute is welcome diff --git a/draft/library/security/openid/consumer/demo/application.e b/draft/library/security/openid/consumer/demo/application.e index 383dbd02..542f101a 100644 --- a/draft/library/security/openid/consumer/demo/application.e +++ b/draft/library/security/openid/consumer/demo/application.e @@ -37,7 +37,7 @@ feature {NONE} -- Initialization do if attached {WGI_NINO_CONNECTOR} conn as nino then create e - if attached e.item ("COMSPEC") as l_comspec then + if attached e.get ("COMSPEC") as l_comspec then e.launch (l_comspec + " /C start " + "http://localhost:" + nino.port.out + "/") else e.launch ("http://localhost:" + nino.port.out + "/") diff --git a/draft/library/security/openid/consumer/openid-safe.ecf b/draft/library/security/openid/consumer/openid-safe.ecf index 4c8472b4..251f1957 100644 --- a/draft/library/security/openid/consumer/openid-safe.ecf +++ b/draft/library/security/openid/consumer/openid-safe.ecf @@ -11,7 +11,7 @@ - + diff --git a/draft/library/security/openid/consumer/openid.ecf b/draft/library/security/openid/consumer/openid.ecf index d3aadcdb..182ffc07 100644 --- a/draft/library/security/openid/consumer/openid.ecf +++ b/draft/library/security/openid/consumer/openid.ecf @@ -11,7 +11,7 @@ - + diff --git a/draft/library/security/openid/consumer/src/openid_consumer.e b/draft/library/security/openid/consumer/src/openid_consumer.e index b9f91d68..2dcc090c 100644 --- a/draft/library/security/openid/consumer/src/openid_consumer.e +++ b/draft/library/security/openid/consumer/src/openid_consumer.e @@ -137,7 +137,7 @@ feature {OPENID_CONSUMER_VALIDATION} -- Implementation sess: HTTP_CLIENT_SESSION ctx: detachable HTTP_CLIENT_REQUEST_CONTEXT xrds_location: detachable READABLE_STRING_8 - xml: XML_STANDARD_PARSER + xml: XML_LITE_PARSER tree: XML_CALLBACKS_DOCUMENT xelt: detachable XML_ELEMENT s: READABLE_STRING_32 @@ -315,8 +315,8 @@ feature {NONE} -- Implementation add_ax_parameters_to (a_uri: URI) local lst: ARRAYED_LIST [READABLE_STRING_8] - l_aliases: STRING_TABLE [READABLE_STRING_8] - l_counts: STRING_TABLE [INTEGER] + l_aliases: HASH_TABLE [READABLE_STRING_8, STRING_8] + l_counts: HASH_TABLE [INTEGER, STRING_8] l_alias: READABLE_STRING_8 s: STRING do @@ -440,7 +440,7 @@ feature {NONE} -- Implementation end end - ax_to_sreg_map: STRING_TABLE [READABLE_STRING_8] + ax_to_sreg_map: HASH_TABLE [READABLE_STRING_8, STRING_8] once create Result.make (7) Result.compare_objects diff --git a/draft/library/security/openid/consumer/src/openid_consumer_validation.e b/draft/library/security/openid/consumer/src/openid_consumer_validation.e index 4f632901..0abb4076 100644 --- a/draft/library/security/openid/consumer/src/openid_consumer_validation.e +++ b/draft/library/security/openid/consumer/src/openid_consumer_validation.e @@ -30,7 +30,7 @@ feature -- Access identity: detachable READABLE_STRING_8 - attributes: STRING_TABLE [READABLE_STRING_32] + attributes: HASH_TABLE [READABLE_STRING_32, STRING_8] feature -- Basic operation @@ -38,7 +38,7 @@ feature -- Basic operation -- Is openid identifier validated? local l_claimed_id: detachable READABLE_STRING_8 - tb: STRING_TABLE [detachable READABLE_STRING_32] + tb: HASH_TABLE [detachable READABLE_STRING_32, STRING_8] ctx: detachable HTTP_CLIENT_REQUEST_CONTEXT ret: URI sess: HTTP_CLIENT_SESSION @@ -120,9 +120,6 @@ feature -- Basic operation end get_attributes (lst: like values) - local - s: READABLE_STRING_32 - sreg_keys: ARRAYED_LIST [READABLE_STRING_32] do attributes.wipe_out @@ -162,7 +159,8 @@ feature -- Basic operation s: READABLE_STRING_32 ax_keys: ARRAYED_LIST [READABLE_STRING_32] l_alias: detachable READABLE_STRING_8 - k_value, k_type, k_count, k: STRING + k_value, k_type, k_count: READABLE_STRING_8 + k: STRING_8 i: INTEGER do if lst /= Void and then attached item_by_name ("openid.signed", lst) as l_signed then @@ -172,13 +170,13 @@ feature -- Basic operation loop i := i + 1 s := c.item - if s.starts_with ("ns.") then - if attached item_by_name ("openid." + s, lst) as v then - if s.same_string ("ns.ax") and v.same_string ("http://openid.net/srv/ax/1.0") then + if s.starts_with ({STRING_32} "ns.") then + if attached item_by_name ({STRING_32} "openid." + s, lst) as v then + if s.same_string ({STRING_32} "ns.ax") and v.same_string ({STRING_32} "http://openid.net/srv/ax/1.0") then l_alias := "ax." else if v.same_string ("http://openid.net/srv/ax/1.0") then - l_alias := s.substring (("ns.").count + 1, s.count) + "." + l_alias := s.substring (("ns.").count + 1, s.count).to_string_8 + "." end end end @@ -238,7 +236,7 @@ feature -- Basic operation end end - item_by_name (a_name: READABLE_STRING_32; lst: like values): detachable READABLE_STRING_32 + item_by_name (a_name: READABLE_STRING_GENERAL; lst: like values): detachable READABLE_STRING_32 local l_found: BOOLEAN do